CODEWITHSUNDEEP
github
stephanie
stephanie

Reputation: 23

Is there a way to view resolved merge conflicts on GitHub?

I recently resolved merge conflicts on 4 different files on the GitHub web editor. I am trying to go back and view the 4 files that had merge conflicts but I can't seem to find any merge conflict history.

Is there a way to view resolved merge conflicts on GitHub?

Upvotes: 2

Views: 176

Answers (1)

VonC
VonC

Reputation: 1324268

Is there a way to view resolved merge conflicts on GitHub?

No, because once resolved, a file which had merge conflict (meaning merge markers) no longer has those markers, and is just a regular file part of a merge commit.

You would need, in a local clone of that GitHub repository, to:

  • artificially retry that merge, just to get the list of files with conflicts
  • compare those files with the same file in the merge commit, to see the difference which would be the merge resolution.

Upvotes: 1

Related Questions