* Re: git gui: merge conflict display is misleading since it hides non-conflicting remote hunks [edit]
@ 2010-03-27 3:34 Jon Seymour
0 siblings, 0 replies; only message in thread
From: Jon Seymour @ 2010-03-27 3:34 UTC (permalink / raw)
To: Git Mailing List
| changed conflict --> __change___
>
> As a result, the user thinks that the only __change__ is the import
> statement, and elects to resolve the commit in favour of the local
> commit. This is the wrong thing to do because the remote hunk is then
> lost to the history.
>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-27 3:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-27 3:34 git gui: merge conflict display is misleading since it hides non-conflicting remote hunks [edit] Jon Seymour
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).