I'm new to git, feature branching etc... but I really like it ;)
Thats my example:
I have my develop branch with let's say "1.0-SNAPSHOT" set as version in my pom.xml.
On top of that I create a feature branch and I want to be able to build that feature branch independently. As a result I (guess I) have to change the version to "1.0-<feature>-SNAPSHOT".
Everything works as expected now. Bamboo will build my feature branch, I can deploy the resulting artefacts, they are different, don't interfere, ...
But now I'm done with my feature and want to merge it.
When I create a "Pull Request" in Stash I have the pom.xml changes as well in there, although I don't want them to be there...
(of course I could just change the version back before the merge, but that's kinda weird)
=> So what is the common workflow for that?
This is one of the real problems with maven. Checking the version into a file in Git is a bad idea (we have the same problem in Stash though).
What we do is to have a special build that does a maven release on a temporary branch, merges back to the original branch and _then_ does a 'git merge --strategy=ours' to the next 'upstream' branch. This merge will completely ignore the changes on the source branch (which is normally something you don't want to do). From that point you can merge up the chain as normal as there will be nothing to merge. It's not quite the same thing as what you're doing though, we don't bother with feature versions, only releases.
So basically you can't really merge the pull request without doing something manual first. Reverting the version before (or just after) the merge might be your best option. It's ugly, but that's maven for you.
Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events