how to prevent useless merge commits in bitbucket?

Question

I'm using Continuous Intergration with PHPCI and stepped off using multiple branches. Currently we're happy with using simply the master branch to commit (and directly build) all changes.

When another programmer pushes something, and I have to commit my things, usually the following happens:

git commit -a -m 'fixed some stuff'
git pull origin master # -- this creates a merge, even when there's no conflicts
git push origin master

This then creates 2 new commits. One of those is completely useless, as it simply restates what the other developer already did! This slows down the CI and is very annoying. I'm fine if there's a commit on a conflict (although there's no real reason to build it separately), but I think there must be a way around these empty merges.. the files didn't actually change aside from the new stuff that was committed.

Anyone know if there's another way to merge that will not create a merge commit?

Todd A. Jacobs · Accepted Answer · 2015-10-28 15:46:07Z

5

Force Fast-Forwards

To avoid merge commits, you need to enforce fast-forwards whenever possible. Both git-merge and git-pull support the --ff-only flag. The man pages say:

   --ff-only
       Refuse to merge and exit with a non-zero status unless the current
       HEAD is already up-to-date or the merge can be resolved as a
       fast-forward.

This flag should help you cleanly merge commits without conflicts that can be resolved as fast-forwards, while still allowing you to handle conflicts in the usual ways.

answered Oct 28, 2015 at 15:46

Todd A. Jacobs

85.1k15 gold badges147 silver badges209 bronze badges

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

Comments

Greg Hurrell · Accepted Answer · 2015-10-28 15:45:46Z

-1

git pull --rebase origin master

answered Oct 28, 2015 at 15:45

Greg Hurrell

5,5071 gold badge28 silver badges30 bronze badges

1 Comment

peterh Over a year ago

Although the code is appreciated, it should always have an accompanying explanation. This doesn't have to be long, but it is expected.

Collectives™ on Stack Overflow

how to prevent useless merge commits in bitbucket?

2 Answers 2

Force Fast-Forwards

Comments

1 Comment

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

Force Fast-Forwards

Comments

1 Comment

Your Answer

Sign up or log in

Post as a guest

Related