Stream: committers/git-help
Topic: Resolve conflict
Michelle (Moseman) Miller (Oct 28 2018 at 14:26):
I got my first conflict when creating the PR.
https://github.com/HL7/fhir/pull/159
Suggestions on how to resolve this conflict? I tried to view the conflict (which seems like an Excel thing) and not sure what to do next to get it resolved in order to approve the PR
Lloyd McKenzie (Oct 28 2018 at 16:09):
Looks like the only conflict is which sheet was active. Go in and say Resolve conflicts and edit the file such that there's only one active sheet, then click on "mark as resolved"
Last updated: Apr 12 2022 at 19:14 UTC
