Local Merges with Git

Hi All, 

We are having an issue where one of our CruiseControl servers is 
making local merge commits.  There are no local changes to files under 
version control, but we frequently see these merge commits.  When 
doing a git status we will see: 
$ git status 
# On branch 2011-2 
# Your branch is ahead of 'origin/2011-2' by 50 commits. 

and a bunch of untracked files, so nothing that should be causing us 
to have local merges and commits. 

Any ideas on what the issue is or what I should be looking at? 

The working copy was created by doing a git clone and "git checkout -b 
2011-2 --track origin/2011-2". 

I'm not sure exactly how the git connector works.  When I ran a build, I
was able to see the following: 
  7932  git pull 
    7933  /bin/bash /usr/local/libexec/git-core/git-pull 
      7950  git fetch --update-head-ok 
        7951  ssh git.repo.com git-upload-pack '/srv/git/repositories/
repo.git' 

Thanks in advance, 
Barry 

 

Confidentiality Notice! This electronic transmission and any attached documents or other writings are confidential and are for the sole use of the intended recipient(s) identified above. This message may contain information that is privileged, confidential or otherwise protected from disclosure under applicable law. If the receiver of this information is not the intended recipient, or the employee, or agent responsible for delivering the information to the intended recipient, you are hereby notified that any use, reading, dissemination, distribution, copying or storage of this information is strictly prohibited. If you have received this information in error, please notify the sender by return email and delete the electronic transmission, including all attachments from your system.

------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network 
management toolset available today.  Delivers lowest initial 
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd

_______________________________________________
Cruisecontrol-user mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/cruisecontrol-user