Closed Bug 582666 Opened 15 years ago Closed 15 years ago

[next.amo] next has a merge conflict

Categories

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

Product:
mozilla.org Graveyard
Component:
Server Operations
Platform:
All
Other
Type:
task
Priority:
Not set
Severity:
major

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

(Reporter: jbalogh, Assigned: oremj)

Details

next.amo got a merge conflict when it updated at 10:50. This is going to block QA. The fix right now: git checkout -f origin/next I think that syntax is right, but you can find me on #webdev if it has issues. The long-term fix: Stop using git pull in update scripts. We should git fetch origin && git checkout -f <branch>. I think that will force updates and ignore any local weirdness. next.amo didn't update cleanly because I did a forced update that messed up the branch history, but that's how we roll over there. Thanks!
Assignee: server-ops → jeremy.orem+bugs
Merge conflict should be fixed for now. I'll do the checkout thing tomorrow. Will that prevent us from having local changes?
git says: 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. (In reply to comment #1) > Will that prevent us from having local changes? Yes, it'll wipe them out.
[root@mradm02 zamboni]# rm -rf .git/rebase-apply [root@mradm02 zamboni]# git pull remote: Counting objects: 49, done. remote: Compressing objects: 100% (25/25), done. remote: Total 27 (delta 17), reused 0 (delta 0) Unpacking objects: 100% (27/27), done. From git://github.com/jbalogh/zamboni a75e981..b02fd6f master -> origin/master Already up-to-date.
(In reply to comment #2) > (In reply to comment #1) > > Will that prevent us from having local changes? > > Yes, it'll wipe them out. Do we care?
I don't think so. Are there some there?
Severity: critical → normal
This has been broken all day again and is blocking new commits to next.
Severity: normal → major
Should be fixed up now. I've also changed everything over to git checkout.
Status: NEW → RESOLVED
Closed: 15 years ago
Resolution: --- → FIXED
Product: mozilla.org → mozilla.org Graveyard
You need to log in before you can comment on or make changes to this bug.