Challenger and learning Git rebase and resolve conflics

by stvkochon 5/4/2015, 8:30:49 AM with 1 comment
  • by stvkochon 5/4/2015, 1:58:37 PM

        # 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