[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: VC mode and git

From: Stefan Monnier
Subject: Re: VC mode and git
Date: Mon, 30 Mar 2015 13:24:04 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux)

>> 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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]