Stream: committers/git-help
Topic: PR conflict on status-codes.xml how to fix
Eric Haas (Jun 03 2019 at 20:25):
I am trying to do PR but am unable to fix the conflict on
Conflicting files
source/status-codes.xml
tried to fix locally - I have done a fetch and merge to master and then checkout to branch with just source/status-codes.xml
after editing went and tried to push and pr again and still a conflict.
Eric Haas (Jun 03 2019 at 22:53):
https://github.com/HL7/fhir/pull/585
Last updated: Apr 12 2022 at 19:14 UTC
