If you want to completely replace a branch by merging over another, the follow trick will help you, as it has helped me:
git checkout yourbranch
git merge -s ours master
git checkout master
git merge yourbranch
If you want to completely replace a branch by merging over another, the follow trick will help you, as it has helped me:
git checkout yourbranch
git merge -s ours master
git checkout master
git merge yourbranch
For further actions, you may consider blocking this person and/or reporting abuse
Sam -
Abdullah Al Mamun Fahim -
Henri Sekeladi -
JT Ziolo -
Top comments (0)