574836 - [preview.amo] git is in the middle of a conflicted merge

Status: VERIFIED FIXED

(mozilla.org Graveyard :: Server Operations, task)

Description

[Jeff Balogh (:jbalogh)]

next tried to update itself automatically, but it's not happy with what's going on.  It found merge conflicts so it's stuck waiting for a human to fix it, so we have conflict markers and syntax errors in files.

This should force next to update: git checkout -f origin/next 

But you might need to `git checkout .` first to clear out the working dir mess.

Find me in #webdev for more help.

Comment 1

[Jeff Balogh (:jbalogh)]

krupa says this is actually on preview.  QA feels sad.

Comment 2

[chizu]

Should be fixed now. 'git checkout -f origin/next' was enough to remove in progress merge.

Comment 3

[Wil Clouser [:clouserw]]

Aw, I missed this last night.  This is still broken.  It looks like it's trying to git merge-base or something.  This is the error:


It seems that I cannot create a rebase-apply directory, and
I wonder if you are in the middle of patch application or another
rebase.  If that is not the case, please
	rm -fr /data/amo_python/src/next/zamboni/.git/rebase-apply
and run me again.  I am stopping in case you still have something
valuable there.

Comment 4

[Wil Clouser [:clouserw]]

I'm no longer getting emails about this.  fixed?

Comment 5

[Wil Clouser [:clouserw]]

Looks like the JS is still messed up (see blocked bug).  This is a critical bug and blocking QA.  What's the status?

Comment 6

[Stephen Donner [:stephend] Not actively reading bugmail]

Looks like this is fixed (seeing updates to preview).