Background:
I have run into the problem that half a year later some code is missing.
I have tracked down the culprit to a certain changeset.
Now this changeset contains about 7000 files (after filtering) and that is a tad too much to go through.
Question:
I would like to see a list of all the files in said merge that had a merge conflict and required manual assistance.
Is there a way to retrieve it now or is it gone like tears in rain?
Its gone like tears in the rain... But there is hope.
If you create a branch from the changeset before the merge then re-run the merge you should get the same conflicts.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.