[sane-devel] [sane-commit] [SCM] SANE backends - scanner drivers branch, master, updated. gitconversion-23-g3ba5515

[Julien BLACHE]

Chris Bagwell <chris at cnpbagwell.com> wrote:

Hi,

> Yes, I would also appreciate if confirmation or clarification when a rebase
> can be used.  I probably mis-interrepted Julien's useful email to mean a
> rebase only works when remote server has changes that do not affect your
> local commits; else a merge is needed.

You can use rebase in both cases. In the simple case, it'll just
fast-forward and reorder your commits on top of HEAD, otherwise it'll
have you fix your commits as needed.

JB.

-- 
Julien BLACHE                                   <http://www.jblache.org> 
<jb at jblache.org>                                  GPG KeyID 0xF5D65169