[YARN-4268] git pull failures in YARN precommit builds

• Type: Bug
• Status: Resolved
• Priority: Critical
• Resolution: Fixed
• Component/s: yarn
• Assignee: Allen Wittenauer
• Reporter: Sidharta Seethana
• Created: 15/Oct/15 11:03
• Updated: 28/Mar/16 04:49
• Resolved: 28/Mar/16 04:49

Description

I have seen a few of these failures during commit builds - requiring manual triggers to get out of this state.

https://builds.apache.org/job/PreCommit-YARN-Build/9452/console

HEAD is now at a49298d Move HDFS-9205 to trunk in CHANGES.txt.
Previous HEAD position was a49298d... Move HDFS-9205 to trunk in CHANGES.txt.
Switched to branch 'trunk'
Your branch is behind 'origin/trunk' by 589 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
	git rebase (--continue | --abort | --skip)
If that is not the case, please
	rm -fr "/home/jenkins/jenkins-slave/workspace/PreCommit-YARN-Build/.git/rebase-apply"
and run me again.  I am stopping in case you still have something
valuable there.
ERROR: git pull is failing