Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

How to resolve gatekeeper merge conflicts

Hello, I've faced the merge conflict issue on gatekeeper execution.

How should I resolve it?

  1. I found the folder with the source d:\Program Files\bamboo-home\xml-data\build-dir\GH3TIER-GH319-JOB1\NorthWind.console\Service.cs
  2. Edit the conflict
  3. issued git add . --all
  4. git commit -m "fixed merge conflict"
  5. git push
    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

    How can I apply the changes to my github repo after the resolving the conflict?


4 answers

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).

Mike, thank you. you really opened my eyes!

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.

Thank you Richard. That's the approach I was looking for.

Happy to help! If you have a spare moment you should accept Mike's answer.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Bamboo

Bamboo 7.1 is here and is packed with value!

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...

588 views 1 6
Read article

Community Events

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

Events near you