When stash automatic merge is turned on version changes to pom.xml in release/X.Y_REL are merged to 'develop'.
We really like the automatic merge feature - how's everyone dealing with this scenario? What's best practice here?
Thanks a lot.
When we create our release branches and update the version in
pom.xml, we manually merge that up and discard the changes (we use
git merge -s ours for that). Once that merge has been done once, all subsequent changes should automatic merge without reapplying the version change. We use a script to cut our releases in part to automate the process of doing that merge and discarding the changes. When cutting point releases (say, 3.7.1), we do that on a separate "release-3.7.1" branch (not "release/3.7.1", so the branch is not picked up as a "Release" branch by the branch model) so that we can do the same merge-discarding-changes back to the "release/3.7" branch (and then onto "release/3.8" and "master"). All of those merges are done manually, not using Stash.
Hope this helps,
Bryan explained how we deal with this below. For a little bit of background, I've wrote about it a while ago, see "Merge strategies" on http://blogs.atlassian.com/2013/11/the-essence-of-branch-based-workflows/
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot