# Preventing rebase confusion

1 messages from 2010-05-06 to 2010-05-06. Participants: Eli Barzilay.
Thread: https://gitlist.dev/t/23718

## Eli Barzilay, 2010-05-06 11:27

Subject: Preventing rebase confusion
Message-ID: <19426.42892.542935.899298@winooski.ccs.neu.edu>
URL: https://gitlist.dev/e/19426.42892.542935.899298%40winooski.ccs.neu.edu

```

Two suggestions (provided that I have the details right):

1. When I run `git rebase origin' I get helpful instructions when a
   conflict happens:

     When you have resolved this problem run "git rebase --continue".
     If you would prefer to skip this patch, instead run "git rebase --skip".
     To restore the original branch and stop rebasing run "git rebase --abort".

   It would be nice if the first line said something like

     When you have resolved this problem run "git add <file>" and then
     "git rebase --continue" (no need to commit).

   My guess is that this is something that confuses many people since
   everywhere conflicts are mentioned the instructions are to `add'
   and then to `commit'.

2. If I did get confused (which can still happen if I don't read the
   above addition) and commit the resolved files, I get this when I
   try `git rebase --continue':

     Applying: document the type of foo
     No changes - did you forget to use 'git add'?

   But of course there are no changes now...  So it would be nice if
   the text also said:

     If you've already committed then you can run "git rebase --skip"
     but your commit will then replace the original "...subject..."

   And/or maybe instructions for using reset to undo the commit and
   let rebase --continue do it.

-- 
          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:
                    http://barzilay.org/                   Maze is Life!

```