Stream: committers/git-help
Topic: missing changes
John Moehrke (Nov 01 2018 at 14:31):
I checked in a change to documentreference-spreadsheet last night. It shows up in the build.fhir.org... but when I pull I get the version prior to my update last night... What am I doing wrong? I suspect I am missing a step after the final merge and starting new work...
Josh Mandel (Nov 01 2018 at 14:32):
If you do "git checkout master" and then "git pull" what do you see?
John Moehrke (Nov 01 2018 at 14:35):
git.exe pull --progress -v --no-rebase "origin"
From https://github.com/HL7/fhir
= [up to date] master -> origin/master
= [up to date] Deep_nesting_snapshot_test -> origin/Deep_nesting_snapshot_test
= [up to date] catalog-service-branch-3 -> origin/catalog-service-branch-3
= [up to date] ewout/18673-use-of-canonical -> origin/ewout/18673-use-of-canonical
= [up to date] healthedata1-GF#19590-fix-vs-title -> origin/healthedata1-GF#19590-fix-vs-title
= [up to date] healthedata1-add-.DS_Store-to-gitignore -> origin/healthedata1-add-.DS_Store-to-gitignore
= [up to date] rik-medicinalProduct2 -> origin/rik-medicinalProduct2
Updating 5f4030c311..95ca0193fc
error: Your local changes to the following files would be overwritten by merge:
source/loinc/loinc.xml
tests/ig/txCache/all-systems.cache
tests/ig30/txCache/all-systems.cache
vscache/all-systems.cache
vscache/lang.cache
vscache/loinc.cache
vscache/ucum.cache
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
vscache/appointment-cancellation-reason.cache
vscache/program.cache
Please move or remove them before you merge.
Aborting
git did not exit cleanly (exit code 1) (1825 ms @ 11/1/2018 9:35:07 AM)
John Moehrke (Nov 01 2018 at 14:36):
it is not clear to me how to handle the loinc... cache issues
Josh Mandel (Nov 01 2018 at 14:36):
More caching issues @Grahame Grieve can we brainstorm about a way to avoid checking these opaque files into the build?
Josh Mandel (Nov 01 2018 at 14:37):
In the meantime you should just delete your cache directory (not "git rm", just a local filesystem delete) and "git pull" again.
John Moehrke (Nov 01 2018 at 14:40):
ah. that worked
Grahame Grieve (Nov 01 2018 at 17:59):
can we brainstorm about a way to avoid checking these opaque files into the build?
Sure. we can just change the build to take 4 hours instead
Last updated: Apr 12 2022 at 19:14 UTC
