bug-gnulib
[Top][All Lists]
Advanced

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

Re: [PATCH] git-merge-changelog: fix missing space after conflict marker


From: Bruno Haible
Subject: Re: [PATCH] git-merge-changelog: fix missing space after conflict markers
Date: Sun, 9 Jan 2011 11:58:54 +0100
User-agent: KMail/1.9.9

Hello Andreas,

> As required by git.

What do you mean by that? The user is expected to resolve the conflict,
and this implies removing the <<<<<<< and >>>>>>> markers, before doing
"git add conflicting-file".

In other words: Please give a reproducible recipe for experiencing a
problem that occurs without your patch.

Please understand that I cannot apply patches that are not accompanied
with a sufficiently clear rationale or a "how to reproduce". Thanks.

Bruno



reply via email to

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