[jitsi-dev] Fwd: master: Merge branch 'master' of https://github.com/jitsi/jitsi.git (bb21aaf)


#1

From the top of my head:

1. git pull (gives you B)
2. git commit (C)
3. git pull (gives the merge commit G -> shit)
4. git reset --hard HEAD~1 (go back to C and throw away all the rest)
5. git pull --rebase (get D,E,F and apply C on top of F, creating C'
6. git push

(1,2,3 and 6 are done anyway)

Or another way:

1. git pull (gives you B)
2. git commit (C)
3. git pull (gives the merge commit G -> shit)
4. git checkout -b HEAD~1 myonelinefixbranch (gives you a new branch that
points to your fix commit C)
5. git checkout master
6. git reset --hard HEAD~2 (go back to B)
7. git pull (get D,E,F into master)
8. git merge myonelinefixbranch
9. git push

(anyway done: 1,2,3 and 9)

Or yet another (not sure if that works though):
1. git pull (gives you B)
2. git commit (C)
3. git pull (gives the merge commit G -> shit)
(make a note somewhere of the sha1 of C)
4. git reset --hard HEAD~2 (go back to B)
5. git pull (get D,E,F into master)
6. git cherrypick <commitid>
7. git push

(anyway done: 1,2,3 and 7)

I rest my case ;).

(Jokes aside, I guess the description above would come very handy on
more than a single future occasion, so thanks!)

Oh, and if you're stuck and I'm online just ask, I don't bite (except if I'm
really hungry) :wink:

Thanks! I'll definitely take you up on that! :slight_smile:

Cheers,
Emil

ยทยทยท

On 15.05.13, 09:39, Ingo Bauersachs wrote:

--
https://jitsi.org