Here is my scenario - I've development and release branches. And I want to merge my changes from development to release branch and if any conflicts during merge and I want to overwrite with the development branch changes.
$ git checkout release => switch from development to release branch
$ git merge -X theirs development => merge changes from development to release branch
Understand more about it here - https://stackoverflow.com/questions/40517129/git-merge-with-force-overwrite
$ git checkout release => switch from development to release branch
$ git merge -X theirs development => merge changes from development to release branch
Understand more about it here - https://stackoverflow.com/questions/40517129/git-merge-with-force-overwrite
No comments:
Post a Comment