On 8/16/11, Leo Butler <l_butler at users.sourceforge.net> wrote:
>> Rebase in particular is significantly different from
>> a simple pull; how shall we choose which one?
>
> This has been discussed on this list.
Let's discuss it again, then, since rebase was only an incidental
topic in a long discussion about some other Git craziness.
To keep it focused, can you explain why sometimes git pull
is enough to keep things up to date, and sometimes git rebase
is needed?
You wrote some notes about Git which was posted to this list.
Can you update the notes to indicate how to deal with pull vs rebase?
best
Robert Dodier