Hi,
Having a strange problem with a merge attempt that makes no sense...
The story:
This message is what is appearing in the build error output:
===============================================================
Checked out
release/Devfd406ef460e024918fb6e0b7db14bc31ba99cd80
Merged with
EDSEDW-379_RETIRE_CIb95340e4c7c913e1b5abc052091c1a911c26c21a
Failure reason
Merge command error: com.atlassian.bamboo.plugins.git.GitCommandException: command /opt/git/bin/git merge --no-commit b95340e4c7c913e1b5abc052091c1a911c26c21a failed with code 1. Working directory was [/u02/atlassian/application-data/bamboo/xml-data/build-dir/serverSide/EDW-EDWD31-1/mergeWorkspace]., stderr: CONFLICT (rename/delete): ops/bin/EWXX844_M_SBL_MKTG_DA_ACH_DEP.ksh deleted in b95340e4c7c913e1b5abc052091c1a911c26c21a and renamed in HEAD. Version HEAD of ops/bin/EWXX844_M_SBL_MKTG_DA_ACH_DEP.ksh left in tree. Automatic merge failed; fix conflicts and then commit the result.
===============================================================
This message comes up when I work on a cloned version of the repo and attempting to merge the same feature branch into the release branch:
===============================================================
git status
# On branch release/Dev
nothing to commit (working directory clean)
----------------------------------------------------------------------------------------
git merge EDSEDW-379_RETIRE_CI
CONFLICT (rename/delete): Rename ops/jobs/EWXX348_M_CI_CROP_INSURANCE.ksh->ops/jobs/ROXX101_M_RDF_OV_COMITMENT_CONTRACT_LOAD.ksh" in HEAD and deleted in EDSEDW-379_RETIRE_CI
Automatic merge failed; fix conflicts and then commit the result.
-bash-4.1$ git status
# On branch release/Dev
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# added by us: ops/jobs/ROXX101_M_RDF_OV_COMITMENT_CONTRACT_LOAD.ksh
#
no changes added to commit (use "git add" and/or "git commit -a")
===============================================================
So, I can fix the local version of the conflict by "git add ops/jobs/ROXX101_M_RDF_OV_COMITMENT_CONTRACT_LOAD.ksh" and committing. However, I cannot fix a merge on the Bamboo server since it's a different file that has the same conflict type.
I am not 100% sure of the shape of the repo as it was loaded, they waited a few months and then instead of wiping the release branch and pushing all the current changes to a new release branch, I believe they just kept what was originally pushed, created a feature branch and pushed and merged all the files again.
Now, the developers are starting to use it and we're coming up with very strange problems like this.
Any ideas about what is going on and how to fix it on the Bamboo build server since the build happens automatically and I can't manually fix the file during the auto-build process?
Another question along these lines...
Is there a way to change the command executed in Bamboo that does the actual merge without having to change a server side parameter and bounce the Atlassian stack? We are using Plan Branches to auto-merge into our release/Dev branch to make the process completely automated.
Thanks!