Hello, I've faced the merge conflict issue on gatekeeper execution.
How should I resolve it?
git push command pushes the changes to some local git repo
To file://D:\Program Files\bamboo-home\xml-data\build-dir\_git-repositories-cache\3cb59ff48a74be5951231f36de6d553f0eb914e3
e96e682..ab38a21 Dev -> Dev
i think you should not resolve it on Bamboo. This is there to notify users their branch would not merge.
I would leave it up to the developers to fix that, e.g. by merging the gatekeeper (master?) branch into theirs and fix the merge conflict and push to their branch.
Bamboo will have to discard the broken build and the next merge on gatekeeper should succeed (must be a fast-forward now).
You definitely should not manually make changes to Bamboo's clone of your git repository.. Mike Friedrich explained the correct process - have one of the developers who worked on the conflicting file merge the branch manually, then commit and push. Bamboo will pull the change and build it.
I'm happy to announce that Bamboo 7.1 has been released and it’s overflowing with awesome new features. Top-voted issues First and foremost, a bunch of JAC top voted issues has been delivered - y...
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