Stream: committers/git-help
Topic: Getting rid of vscache conflict
Eric Haas (Oct 31 2018 at 03:33):
I keep getting modified files like vscache/lang.cache, vscache/ucum.cache which lead to conflicts when pushing upstream so I have added them to my .git/info/exclude file.
Eric Haas (Oct 31 2018 at 03:34):
maybe this is helpful to others
Eric Haas (Oct 31 2018 at 03:37):
another way is to do a
git checkout [last commit]~1 -- [cache file]
e.g. git checkout 9635098891~1 -- vscache/loinc.cache
Eric Haas (Oct 31 2018 at 03:37):
to scrub it after you find out about the conflict on the PR and then just recommit
Lloyd McKenzie (Oct 31 2018 at 03:46):
I just exclude them from my commits and revert them
Last updated: Apr 12 2022 at 19:14 UTC
