Gatekeeper merging has stopped merging changes

We are using github as a repo and have a build using the gatekeeper that was merging changes from our ci branch into our staging branch. This was working properly, but now seems to have stopped merging any changes.

Here is what git log shows for the ci branch:

commit 9ab1058e9c9de6aa148449e798feb63c71dda554

Author: bappelt

Date: Fri Sep 14 09:33:26 2012 -0500

test commit

commit b88ae4b488678e9b9a08771e766cb9fd47e3d77a

Author: Byron Appelt

Date: Thu Sep 13 12:23:43 2012 -0500

changes to manage new and legacy style daemons

commit 5b7e3798c41cc8ed49ac0a6292e7b31eaa452061

Merge: f672aba cd8e479

Author: Byron Appelt

Date: Tue Sep 11 14:00:09 2012 -0500

Merge branch 'ci' of github.com:numerex/puppet into ci

commit f672aba9cead45440517de8759ab284a31e103bb

Author: Byron Appelt <bappelt@numerex.com>

Date: Tue Sep 11 13:57:55 2012 -0500

added cnf file

And here is a snippet from the build log (attached):

simple 14-Sep-2012 14:34:15 Checking out revision 5b7e3798c41cc8ed49ac0a6292e7b31eaa452061.

simple 14-Sep-2012 14:34:15 Creating local git repository in '/disk1/Bamboo/xml-data/build-dir/PUPPET-MAIN1-JOB1/.git'.

simple 14-Sep-2012 14:34:15 /usr/bin/git log -1 --format=%d --decorate=full 5b7e3798c41cc8ed49ac0a6292e7b31eaa452061

simple 14-Sep-2012 14:34:16 /usr/bin/git checkout -f staging

simple 14-Sep-2012 14:34:16 Already on 'staging'

simple 14-Sep-2012 14:34:16 Merging code from PUPPET-MAIN1-JOB1, revision 9ab1058e9c9de6aa148449e798feb63c71dda554

simple 14-Sep-2012 14:34:18 Merged new changesets from PUPPET-MAIN1-JOB1

simple 14-Sep-2012 14:34:18 Updated source code to revision: 5b7e3798c41cc8ed49ac0a6292e7b31eaa452061

As you can see, it appears to check out 5b7e3798c41cc8ed49ac0a6292e7b31eaa452061 and merge changes from 9ab1058e9c9de6aa148449e798feb63c71dda554, which seems correct, but then it says it is updating to the older 5b7e3798c41cc8ed49ac0a6292e7b31eaa452061 and no changes ever get pushed on the staging branch.

3 answers

This widget could not be displayed.

Are you using Bamboo or other product to manage merging or management of your repos?

This widget could not be displayed.

We are using Bamboo. Sorry, I posted this through the ticketing system and some info got left out. I am also adding the attachements.

This widget could not be displayed.

No problem :) It's likely that these issues might require some in-depth debugging though, so it might be best to go through our support team if you don't get a response here;

http://support.atlassian.com

Let us know the answer here if you do go that route.

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Posted Wednesday in Teamwork

What teamwork quotes inspire you?

Hey everyone! My name is Natalie and I'm an editor of the Atlassian Blog and I've got a question for you: What's your favorite quote about teamwork?  We've compiled a list here, along with...

161 views 16 7
Join discussion

Atlassian User Groups

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!

Find my local user group

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

Groups near you