Discussion on: How To Avoid Merge Conflicts

allenh1 profile image
Hunter L. Allen

What about this?

$ git fetch
$ git rebase -i origin/[target branch]
$ git push --force-with-lease

While these tools are good, the best way, in my experience, to avoid merge conflicts is to simply rebase your branch into your target branch. I usually do this once a day.

samuyi profile image
Samuyi Author

Well i think that flow is really good. Especially when you're pulling from remote branches.