Build fails during buildpack detection

[ghost]

Originally reported by: Jason R. Coombs (Bitbucket: jaraco, GitHub: jaraco)

---

A build is failing when attempting to update a buildpack for detection with this output:

From https://yougov.kilnhg.com/Code/Repositories/O/scala-buildpack-v2

 * branch            master     -> FETCH_HEAD

Already up-to-date.

run: git fetch --tags
run: git fetch
run: git checkout a8e7146975c547228dcf1f1d23dc2d1d030af8d5
HEAD is now at a8e7146... Removing unintentionally committed line

run: git fetch --tags
run: git pull origin master
U   bin/utils

Pull is not possible because you have unmerged files.

Please, fix them up in the work tree, and then use 'git add/rm <file>'

as appropriate to mark resolution, or use 'git commit -a'.

---

• Bitbucket: https://bitbucket.org/yougov/velociraptor/issue/186

[ghost]

Original comment by Jason R. Coombs (Bitbucket: jaraco, GitHub: jaraco):

---

On both our build servers, I'm able to git pull origin master, so I'm not sure where the unmerged files error is coming from:

jaraco@vybuild3:/apps/builder/buildpacks/scala-buildpack-v2-d4e12043645770d25bf1335125918af3$ sudo git pull origin master
From https://yougov.kilnhg.com/Code/Repositories/O/scala-buildpack-v2
 * branch            master     -> FETCH_HEAD
Already up-to-date.

[ghost]

Original comment by Jason R. Coombs (Bitbucket: jaraco, GitHub: jaraco):

---

Also, the first build failed with the above error, but a subsequent build succeeded, even though I can find no discrepancies in the buildpacks on the two build hosts:

[ghost]

Original comment by Jason R. Coombs (Bitbucket: jaraco, GitHub: jaraco):

---

Since I'm unable to replicate the problem, I'm not sure there's any action to be taken here.

[ghost]

Original comment by Jason R. Coombs (Bitbucket: jaraco, GitHub: jaraco):

---

This issue is also affecting the build of another app, and repeatedly.

[ghost]

Original comment by Jason R. Coombs (Bitbucket: jaraco, GitHub: jaraco):

---

Hmm. After several build failures (with the aforementioned error), I wiped the buildpack on our two workers, and the next build succeeded. Coincidence? I'm pretty sure I've wiped this buildpack from both workers before, but perhaps not, and perhaps there was something lingering in another worker. I'll continue to monitor the situation...