0

I dont have access to commit the code directly in 'master'. I need to merge the code from 'branch' to 'master'.
I have to over-write or replace the existing changes in 'master'.
I am trying the steps given in this thread. Git: Merge to master while automatically choosing to overwrite master files with branch

Can you anyone suggest any steps to over-write the changes in master from branch

user1514499
  • 732
  • 5
  • 26
  • 58
  • 3
    can't you just open a Pull Request, see the changes, solve conflicts and then approve and merge? If your master is protected, that's the standard way to go. – Leonardo Alves Machado Mar 13 '19 at 19:19
  • Thanks. this worked (after trying this - https://coderwall.com/p/ffz7xg/overwrite-master-branch-with-current-branch-in-git) – user1514499 Mar 13 '19 at 20:04

1 Answers1

1

I'm just formulating an answer based on my comment - which apparently was worthy...

To follow the standard way to go, you should open a Pull Request. This way you can see the changes, solve the conflicts, get your request approved (protected repositories require that) and, finally, merged to the master.

Leonardo Alves Machado
  • 2,481
  • 7
  • 31
  • 43