News for hackers. Stuff that matters.

A comment on Challenger and learning Git rebase and resolve conflics.

Re:Challenger and learning Git rebase and resolve conflics by stvkoch on Monday May 04, 2015 @09:58AM (#9486141) 

    # result ...
    git rebase foo bar
    # ... resolve conflicts
    git add content.txt
    git rebase --continue

    # HERE is the trick... we have several ways to make this.
    git rebase --onto bar master~3 master
    # .. resolve conflicts
    git add .
    git rebase --continue
[ Parent | on HN ]

There are no comments on this comment yet.