Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solution: Cannot update CRIkit2 with git #82

Open
CCampJr opened this issue Jun 1, 2019 · 0 comments
Open

Solution: Cannot update CRIkit2 with git #82

CCampJr opened this issue Jun 1, 2019 · 0 comments
Labels

Comments

@CCampJr
Copy link
Owner

CCampJr commented Jun 1, 2019

Running git pull returns an error to the effect: "Your local changes to the following files would be overwritten by merge.... Please commit your changes or stash them before you merge."

This is do to changes to the CRIkit2 directory on your computer that conflict with updates on the repo on Github. If you have not explicitly edited the repo, the most likely cause is (re-)building the documentation after you installed CRIkit2 via git clone

Simple solution.

cd CRIkit2 repo directory

# This will basically move your changes into an archive and set the install back to its normal state
git stash -m "Stashing changes"

git pull  # Now, do the update

This should fix the problem

@CCampJr CCampJr pinned this issue Jun 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

1 participant