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?

Improve this question
3
  • Did you check that? stackoverflow.com/questions/16358418/… . It should solve your problem. Commented Oct 14, 2015 at 19:25
  • hm ja, rebasing would be an option, but why do the repositories diverge in the first place? Commented Oct 15, 2015 at 5: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. Commented Nov 20, 2021 at 23:42
Related questions
1
using git skip-worktree to disable file updates, issues with merge
24
Git avoiding "merge branch master"
1
How does one create a multiple "syncronous" repository remote GIT branch in intelliJ
Load 7 more related questions Show fewer related questions

0

Reset to default

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.