1

I know there are several questions concerning multiple merge remote-tracking branch origin/master commits, albeit they all seem to address cases where multiple users are using a Git repository. However, in my case I’m using the repository alone, and still have those merge commits on almost every push. See the screenshot for an example. These commits were commited and pushed consecutively from the same machine by the same user.

DAG

How can I stop these unnecessary merge events?

Zombo
  • 1
  • 62
  • 391
  • 407
gapvision
  • 999
  • 1
  • 10
  • 30
  • Did you check that? http://stackoverflow.com/questions/16358418/how-to-avoid-merge-commit-hell-on-github-bitbucket . It should solve your problem. – grimsock Oct 14 '15 at 19:25
  • hm ja, rebasing would be an option, but why do the repositories diverge in the first place? – gapvision Oct 15 '15 at 05:10
  • You get those merge messages when the origin/master repo is not in sync with your local working directory. You need to "sync" _before_ adding new code or rebase. – gregory Nov 20 '21 at 23:42

0 Answers0