[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Making git as easy as CVS, for handling merge conflicts
|
From: |
Dmitry Alexandrov |
|
Subject: |
Re: Making git as easy as CVS, for handling merge conflicts |
|
Date: |
Mon, 28 Oct 2019 08:22:30 +0300 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
Taylan Kammer <address@hidden> wrote:
> On 28.10.2019 00:51, Richard Stallman wrote:
>> Is it possible to write a front-end for Git which reliably handles merge
>> conflicts the way CVS handles them?
>
> I don't know how CVS handles merge conflicts
Well, IIRC, the same way git-merge(1) does¹: by creating a file with <<<<<<<
======= >>>>>>> marks.
-
¹ Speaking historically, the other way round, of course.
signature.asc
Description: PGP signature