Don't include merge conflict commit into git push

Question

When I resolve a conflict, I have a merge commit in addition to the "real commit" I've made. It looks as following:

Merge branch 'master' of http://myDomain.com/git/SIMULATOR

What is the best way to squash it into my "real commit", so that I have only one commit when pushing it to the server?

defuz · Accepted Answer · 2012-10-01 16:08:13Z

1

git fetch origin git rebase master origin/master git push origin master

PS. Read man git-rebase

answered Oct 1, 2012 at 16:08

defuz

27.7k10 gold badges40 silver badges60 bronze badges

Sign up to request clarification or add additional context in comments.

Comments

user4815162342 · Accepted Answer · 2012-10-01 20:06:05Z

If have an existing merge commit, you can use git rebase, as answered by defuz—but then you will have to resolve the conflicts again.

Otherwise, use git merge --squash to squash changes introduced by the merge into a single commit. Resolve the conflicts if any, and run git commit.

Collectives™ on Stack Overflow

Don't include merge conflict commit into git push

2 Answers 2

Comments

Comments

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

Comments

Comments

Related