gnu-system-discuss
[Top][All Lists]
Advanced
[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:25:42 +0300
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) 
Taylan Kammer <address@hidden> wrote:
> Magit is a very nice front-end to Git and aides with merging as well.
> https://magit.vc/manual/magit/Resolving-Conflicts.html

The linked manual says:
| Magit does not provide its own tools for conflict resolution

Attachment: signature.asc
Description: PGP signature

reply via email to
[Prev in Thread] Current Thread [Next in Thread]