* Getting "Automatic merge failed" although all conflicts were resolved using previous resolution
@ 2013-04-14 12:39 Sebastian Schuberth
0 siblings, 0 replies; only message in thread
From: Sebastian Schuberth @ 2013-04-14 12:39 UTC (permalink / raw)
To: git
Hi,
I just realized Git merge still outputs
Automatic merge failed; fix conflicts and then commit the result.
although all of my conflicts were resolved using a previously recorded resolution. I think it's OK for Git to not just do the merge commit in that case to sort of force a review of the resolution, but still I think the message is misleading. It should probably rather say something like
All conflicts resolved using previous resolutions; please review and then commit the result.
Opinions?
--
Sebastian Schuberth
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-14 12:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-14 12:39 Getting "Automatic merge failed" although all conflicts were resolved using previous resolution Sebastian Schuberth
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.