* (no subject)
@ 2020-04-21 20:05 Joshua Hudson
0 siblings, 0 replies; only message in thread
From: Joshua Hudson @ 2020-04-21 20:05 UTC (permalink / raw)
To: git
We've been getting really annoying merge conflicts that aren't
logically merge conflicts but git can't resolve them of itself.
$ git merge origin/master
merge conflicts
src/data/record.type2.dat
src/data/record.type3.dat
src/data/localization.strings.dat
$
where it would be quite reasonable to make a merge tool that merged
localization.strings.dat only if it could also edit record.*.dat as
well.
However, if it picked up the result of an automatic merge of
record.*.dat it just won't work as it no longer has enough information
to do the merge.
The approach is specific to the structure of these dat files, and
would not be generally applicable.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-04-21 20:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-21 20:05 Joshua Hudson
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).