[Top][All Lists]

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

Re: VC mode and git

From: Andreas Schwab
Subject: Re: VC mode and git
Date: Wed, 01 Apr 2015 12:35:52 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)

Richard Stallman <address@hidden> writes:

> 2. With CVS, merge conflicts are easy to handle -- just edit the file,
> look for the <<< and >>> that indicate conflicts, and fix up each one.

And if you did something wrong you are lost.  No way to redo the merge.

> Can I do it that way in Git?

Yes, only much better.  If the merge went wrong in some way, just redo


Andreas Schwab, SUSE Labs, address@hidden
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

reply via email to

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