Stream: committers
Topic: TortoiseGit - help with conflict
John Moehrke (Oct 12 2018 at 21:01):
I did a GIT based build and pull prior to the WGM. I am now getting ready to make more changes. But when I try to sync my local copy (TortoiseGIT Pull) I get the following failure because GIT seems to think I have a modified version of loinc.xml and snomed.xml. I have no idea how to resolve. I have tried to use the help pages. When I do a TortoiseGit->Resolve, I get "File list is empty". I know I have not modified these locally. I just want to sync everything so I can get started.
....
error: Your local changes to the following files would be overwritten by merge:
source/loinc/loinc.xml
source/snomed/snomed.xml
Please commit your changes or stash them before you merge.
Aborting
Lloyd McKenzie (Oct 12 2018 at 21:04):
Those files get created/changed every time you run a build. If you go in to do a commit, you should see that those files have changes. You can either commit them (and let the stuff from the master merge into them) or right-click on them and say "revert" to remove any local changes, then cancel out of the commit.
John Moehrke (Oct 12 2018 at 21:11):
okay... with GIT , I have no idea how to do what you just said... I go to the loinc.xml file, and right click, go to TortoiseGit and see no ability to say "revert"
John Moehrke (Oct 12 2018 at 21:12):
in the old SVN days... at this point I would just delete my whole fhir/* directory and grab everything fresh... can I do that?
Lloyd McKenzie (Oct 12 2018 at 21:44):
Right-click, go into TortoiseGit, say commit, then find the 2 problem files, right-click on those and say "revert"
John Moehrke (Oct 12 2018 at 21:52):
okay.. tried that. I don't get loinc.xml or snomed.xml in the list of changes made...
John Moehrke (Oct 12 2018 at 21:53):
when I do a GIT diff on loinc.xml... it says there are no change except for CR/LF... I can't even say ignore there.
John Moehrke (Oct 12 2018 at 21:53):
can I just delete my file?
Lloyd McKenzie (Oct 12 2018 at 21:54):
You can try that. But don't commit the deletion :)
John Moehrke (Oct 12 2018 at 21:54):
oh.. ugg
John Moehrke (Oct 12 2018 at 22:42):
I am still blocked by this... anyone else help me?
Lloyd McKenzie (Oct 12 2018 at 22:55):
So you try to commit and you can't see anything, but you can't pull because it says you have uncommitted changes?
John Moehrke (Oct 12 2018 at 23:07):
correct. and when I do a diff on the file it tells me there are no differences other than CR/LF.
Grahame Grieve (Oct 12 2018 at 23:15):
already committed to a local branch
John Moehrke (Oct 12 2018 at 23:48):
Ill try what ever you recommend I try.
Lloyd McKenzie (Oct 13 2018 at 02:17):
Post your issue on the git-help thread and we'll see what the experts suggest...
Last updated: Apr 12 2022 at 19:14 UTC
