[CI] Merging is not possible because you have unmerged files.

[marcoabreu]

Description WIP

Initial error: http://jenkins.mxnet-ci.amazon-ml.com/blue/organizations/jenkins/incubator-mxnet/detail/PR-9406-merge/1/pipeline/

Pull request #9406 opened

Connecting to https://api.github.com using cjolivier01/******

Checking out git https://github.com/apache/incubator-mxnet.git into /var/lib/jenkins/workspace/cubator-mxnet_PR-9406-merge-IWOL2LWEYWILCMVJ327KHGMU27SZHSVFB3IKRA4SZBAZPPWMBTUA@script to read Jenkinsfile

Cloning the remote Git repository

Cloning with configured refspecs honoured and without tags

Cloning repository https://github.com/apache/incubator-mxnet.git

 > git init /var/lib/jenkins/workspace/cubator-mxnet_PR-9406-merge-IWOL2LWEYWILCMVJ327KHGMU27SZHSVFB3IKRA4SZBAZPPWMBTUA@script # timeout=10

Fetching upstream changes from https://github.com/apache/incubator-mxnet.git

 > git --version # timeout=10

using GIT_ASKPASS to set credentials 

 > git fetch --no-tags --progress https://github.com/apache/incubator-mxnet.git +refs/pull/9406/head:refs/remotes/origin/PR-9406-merge +refs/heads/master:refs/remotes/origin/master

 > git config remote.origin.url https://github.com/apache/incubator-mxnet.git # timeout=10

 > git config --add remote.origin.fetch +refs/pull/9406/head:refs/remotes/origin/PR-9406-merge # timeout=10

 > git config --add remote.origin.fetch +refs/heads/master:refs/remotes/origin/master # timeout=10

 > git config remote.origin.url https://github.com/apache/incubator-mxnet.git # timeout=10

Fetching without tags

Fetching upstream changes from https://github.com/apache/incubator-mxnet.git

using GIT_ASKPASS to set credentials 

 > git fetch --no-tags --progress https://github.com/apache/incubator-mxnet.git +refs/pull/9406/head:refs/remotes/origin/PR-9406-merge +refs/heads/master:refs/remotes/origin/master

Merging remotes/origin/master commit 67cfbc863d9d05baa2362a82cb78e0acb569d6ba into PR head commit f6b9492c8431bb111a59ff1d938813a264078d48

 > git config core.sparsecheckout # timeout=10

 > git checkout -f f6b9492c8431bb111a59ff1d938813a264078d48

 > git merge 67cfbc863d9d05baa2362a82cb78e0acb569d6ba # timeout=10

 > git config core.sparsecheckout # timeout=10

 > git checkout -f f6b9492c8431bb111a59ff1d938813a264078d48



GitHub has been notified of this commit’s build result



hudson.plugins.git.GitException: Command "git merge 67cfbc863d9d05baa2362a82cb78e0acb569d6ba" returned status code 1:

stdout: CONFLICT (rename/delete): tests/python/unittest/test_contrib_text.py deleted in 67cfbc863d9d05baa2362a82cb78e0acb569d6ba and renamed in HEAD. Version HEAD of tests/python/unittest/test_contrib_text.py left in tree.

CONFLICT (rename/delete): python/mxnet/contrib/text/utils.py deleted in 67cfbc863d9d05baa2362a82cb78e0acb569d6ba and renamed in HEAD. Version HEAD of python/mxnet/contrib/text/utils.py left in tree.

CONFLICT (rename/delete): python/mxnet/contrib/text/indexer.py deleted in 67cfbc863d9d05baa2362a82cb78e0acb569d6ba and renamed in HEAD. Version HEAD of python/mxnet/contrib/text/indexer.py left in tree.

CONFLICT (rename/delete): python/mxnet/contrib/text/glossary.py deleted in 67cfbc863d9d05baa2362a82cb78e0acb569d6ba and renamed in HEAD. Version HEAD of python/mxnet/contrib/text/glossary.py left in tree.

CONFLICT (rename/delete): python/mxnet/contrib/text/embedding.py deleted in 67cfbc863d9d05baa2362a82cb78e0acb569d6ba and renamed in HEAD. Version HEAD of python/mxnet/contrib/text/embedding.py left in tree.

CONFLICT (rename/delete): python/mxnet/contrib/text/__init__.py deleted in 67cfbc863d9d05baa2362a82cb78e0acb569d6ba and renamed in HEAD. Version HEAD of python/mxnet/contrib/text/__init__.py left in tree.

Removing example/warpctc/toy_ctc.py

Removing example/warpctc/ocr_predict.py

Removing example/warpctc/lstm_ocr.py

Removing example/warpctc/lstm_model.py

Removing example/warpctc/lstm.py

Removing example/warpctc/infer_ocr.py

Removing example/warpctc/README.md

Removing example/ctc/lstm_ocr.py

Removing docs/tutorials/speech_recognition/speech_lstm.md

Removing docs/tutorials/speech_recognition/baidu_warp_ctc.md

Removing docs/api/python/text/text.md

Automatic merge failed; fix conflicts and then commit the result.

Future errors: http://jenkins.mxnet-ci.amazon-ml.com/blue/organizations/jenkins/incubator-mxnet/detail/PR-9406-merge/9/pipeline/

Connecting to https://api.github.com using cjolivier01/******

Checking out git https://github.com/apache/incubator-mxnet.git into /var/lib/jenkins/workspace/cubator-mxnet_PR-9406-merge-IWOL2LWEYWILCMVJ327KHGMU27SZHSVFB3IKRA4SZBAZPPWMBTUA@script to read Jenkinsfile

 > git rev-parse --is-inside-work-tree # timeout=10

Fetching changes from the remote Git repository

 > git config remote.origin.url https://github.com/apache/incubator-mxnet.git # timeout=10

Fetching upstream changes from https://github.com/apache/incubator-mxnet.git

 > git --version # timeout=10

using GIT_ASKPASS to set credentials 

 > git fetch --tags --progress https://github.com/apache/incubator-mxnet.git +refs/pull/9406/head:refs/remotes/origin/PR-9406-merge +refs/heads/master:refs/remotes/origin/master

Merging remotes/origin/master commit 67cfbc863d9d05baa2362a82cb78e0acb569d6ba into PR head commit 17a93432434e87b83cfdcfd705fa7f515a220d40

 > git config core.sparsecheckout # timeout=10

 > git checkout -f 17a93432434e87b83cfdcfd705fa7f515a220d40

 > git merge 67cfbc863d9d05baa2362a82cb78e0acb569d6ba # timeout=10

 > git config core.sparsecheckout # timeout=10

 > git checkout -f 17a93432434e87b83cfdcfd705fa7f515a220d40



GitHub has been notified of this commit’s build result



hudson.plugins.git.GitException: Command "git merge 67cfbc863d9d05baa2362a82cb78e0acb569d6ba" returned status code 128:

stdout: 

stderr: error: Merging is not possible because you have unmerged files.

hint: Fix them up in the work tree, and then use 'git add/rm <file>'

hint: as appropriate to mark resolution and make a commit.

fatal: Exiting because of an unresolved conflict.

git status on Jenkins master

ubuntu@jenkins:/var/lib/jenkins/workspace/cubator-mxnet_PR-9406-merge-IWOL2LWEYWILCMVJ327KHGMU27SZHSVFB3IKRA4SZBAZPPWMBTUA@script$ git status
warning: unable to access '/home/ubuntu/.config/git/attributes': Permission denied
warning: unable to access '/home/ubuntu/.config/git/ignore': Permission denied
HEAD detached at 90a0eb03
Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

	added by us:     python/mxnet/contrib/text/embedding.py
	added by us:     python/mxnet/contrib/text/glossary.py
	added by us:     python/mxnet/contrib/text/indexer.py
	added by us:     python/mxnet/contrib/text/utils.py
	added by us:     tests/python/unittest/test_contrib_text.py

no changes added to commit (use "git add" and/or "git commit -a")

[vdantu]

@marcoabreu : Are you still seeing this conflicts?

@sandeep-krishnamurthy : Please label it as "CI".

[marcoabreu]

Thank you for reminding me. This was due to a permission issue on CI side.