Re: VC mode and git

[Stefan Monnier <monnier@iro.umontreal.ca>]

>> But what if rebasing fails?  Then you are left resolving a conflict
>> before you can attempt the push operation again.  I do not know how you
>> would want to handle this.

The way we'd normally handle this (e.g. the way Bazaar handled it, and
the way CVS handled it) is to abort the commit operation.  Then the user
can do the "pull" any which way he wants, and try to commit again.

Doing "git pull --rebase" and trying to handle conflicts directly from
the commit hook is madness, IMNSHO.

> In any case, I think it is clear now that post-commit hooks cannot be
> the solution,

To me, it's clear that such hooks can definitely, cleanly, reliably
provide the expected "cvs commit"-like semantics.


        Stefan