[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: In git, how does one revert a single file with merge conflicts in it
|
From: |
Eli Zaretskii |
|
Subject: |
Re: In git, how does one revert a single file with merge conflicts in it? |
|
Date: |
Mon, 02 Feb 2015 18:05:26 +0200 |
> Date: Mon, 2 Feb 2015 12:00:03 +0000
> From: Alan Mackenzie <address@hidden>
>
> On doing
> $ git cherry-pick -xe <Commit Id>
> , I get a half error message: "error: could not apply f3f7acc... ...".
> Further investigation reveals that the cause is conflicts in a ChangeLog
> file. No surprises there.
I suggest that you install the git-merge-changelog program and
configure it as the merge driver for ChangeLog files. Then the
probability of such conflicts will be very close to zero.