Automatically merging based on version numbers is cool. But I don't always want to do that.
Occasionally, there will be a change that should only go into the production branch, but not the development one.
For example, suppose I to adjust the database connection pool to compensate for a bug in production. The bug has been fixed in development, so no workaround commit is needed on the development branch.
What is best way to selectively not auto-merge?
Screenshot from 2014-11-04 01:15:26.png
I don't think it's feasible to not auto-merge, as that would cause the changes to be picked up on the next similar pull request.
But I believe it work to "pre-merge" with the "ours" strategy.
git checkout branch-to-exclude git merge -s ours PROJECT-123
The merge will still happen, but it won't take any changes from the branch.
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs