-
Notifications
You must be signed in to change notification settings - Fork 37
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
n-update fails #10
Comments
mklement0
added a commit
that referenced
this issue
Jan 28, 2017
mklement0
added a commit
that referenced
this issue
Jan 28, 2017
@brbsix: I appreciate your bringing this to my attention and especially suggesting a fix - it is now implemented, and seems to be working OK. To update an installed copy of cd "$N_PREFIX/bin"
curl https://raw.githubusercontent.com/mklement0/n-install/stable/bin/n-update > n-update and then run |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
The last few times that I've run
n-update
, I've received errors similar to the following:I would guess that this is caused by the
--depth 1
flag (discussed in #6 and introduced in 9e9347d). Because there is no history, instead of just pulling in the changes, git thinks you are trying to merge two different entirely unrelated projects together. You can use--allow-unrelated-histories
to ignore the warning, but then you end up with a bunch of merge conflicts. Assuming that's the problem, maybe replacegit pull --depth 1
with something likegit fetch --depth 1 && git reset --hard origin/master
?The text was updated successfully, but these errors were encountered: