4

We have two branches in the remote git repository: master branch and develop branch. When I merge develop branch into master branch, how can I avoid merging conflict? If I solve the conflict in the master branch, then I need to merge master branch back to develop branch to keep develop updated. I do not think it is a good practice. Can anyone help me with this?

My question is more on what the best practice to merge develop branch to master branch to keep master branch clean.

Thanks

PLee
  • 393
  • 9
  • 26
  • Possible duplicate of [How to avoid git conflicts in a team?](https://stackoverflow.com/questions/16490873/how-to-avoid-git-conflicts-in-a-team) – Julian Jun 14 '19 at 23:55

2 Answers2

4

My question is more on what the best practice to merge develop branch to master branch to keep master branch clean

You could follow gitflow, see detailed explanation here: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

In summary:

  • keep master insync with latest release
  • merge features branches to develop
  • merge hotfixes branches to develop and master
  • when creating a regular release (not hotfix), create a release branch from develop and merge to master when releasing
Julian
  • 33,915
  • 22
  • 119
  • 174
2

I dont think there is anything wrong with the way you suggested. There is no way to 'sync' branches. I've used this method:

(develop)$git merge master

Resolve conflicts then:

(develop)$git checkout master
(master)$git merge develop

There should not be any conflicts since you already resolved them, but if there are accept all changes from develop since they are the changes you want. (Not too clear about what happens here, would need to test again to be sure)

If you mess up do:

(either branch)$git reset --hard HEAD~1

Now your branch is right before you did the merge. If you did a rebase it would be harder to undo a mistake because it changes your git history.

Dustin K
  • 150
  • 2
  • 11