From: Raman Gupta <rocketraman@gmail.com>
Date: Tue, 25 Jul 2017 15:09:55 GMT
Subject: [RFC] Git rerere and non-conflicting changes during conflict resolution
Message-ID: <17c46229-3b64-34f1-30fa-d40b77e1c054@gmail.com>

I had an interesting situation today: resolving a merge conflict
required modification in other files that were not themselves conflicting.

I just realized that rerere does not remember any changes to these
additional files -- only changes to the conflicting files. This makes
the end result of rerere obviously incorrect in this situation.

So my questions are:

1) Is this a known limitation or is there a reason rerere works in
this manner?

1b) If it is a limitation/bug, what would be needed to fix it? With
some guidance, I might be able to submit a patch...

2) In the meantime, is there a way I can identify these cases, without
which I cannot really trust rerere is doing the right thing?

Regards,
Raman