Stream: committers/git-help
Topic: Pull 63
Grahame Grieve (Oct 10 2018 at 03:13):
https://github.com/HL7/fhir/pull/63 has gone awry. it may be that I screwed up the merge - though the error seems to have nothing to do with that.
Grahame Grieve (Oct 10 2018 at 03:13):
I'm not sure what the process is going forward.
Grahame Grieve (Oct 10 2018 at 03:13):
and I wish I knew why merge conflicts are constant for me; git seems to be manufacturing them
Bryn Rhodes (Oct 10 2018 at 03:27):
Do you get that error locally when you try to build that branch?
Bryn Rhodes (Oct 10 2018 at 03:28):
And what files do you get conflicts with?
Grahame Grieve (Oct 10 2018 at 03:28):
no. because I'm entirely unkeen on destroying my existing work or synchronising an entirely new clone (bandwidth is extremely expensive in Australia courtesy or our government - I mean Rupert Murdoch...)
Grahame Grieve (Oct 10 2018 at 03:29):
I fixed a conflict in the spreadsheet. Which appeared to be the entire spreadsheet... as if that somehow makes sense .
Bryn Rhodes (Oct 10 2018 at 03:29):
I'll take a look
Bryn Rhodes (Oct 10 2018 at 04:27):
So, this is the problem: https://github.com/HL7/fhir/blob/pharmacy-medRequest/source/medicationrequest/medicationrequest-spreadsheet.xml#L8757
Bryn Rhodes (Oct 10 2018 at 04:27):
Not sure whether that's a merge issue or a canonicalization issue?
Bryn Rhodes (Oct 10 2018 at 04:29):
I can't tell which one is right, the top half or the bottom half.
Grahame Grieve (Oct 10 2018 at 04:40):
top
Grahame Grieve (Oct 10 2018 at 04:41):
thx
Bryn Rhodes (Oct 10 2018 at 05:56):
Okay, there were a few other issues too but those are fixed and it's ready to merge. Shall I go ahead and merge?
Bryn Rhodes (Oct 10 2018 at 05:58):
Okay, merged.
Grahame Grieve (Oct 10 2018 at 07:05):
thx heaps
Last updated: Apr 12 2022 at 19:14 UTC
