search

TorchAPI / Torch

An extensible modding framework and improved client/DS for Space Engineers. Still a work in progress!
Apache License 2.0
146 stars 76 forks source link

When path contains spaces #88

Closed szczepix closed 7 years ago

Equinox- commented 7 years ago

Please run the following commands on your local repository; we prefer rebases instead of merges for things like this. If you prefer I can do this myself.

git checkout patch-1
git remote add upstream https://github.com/TorchAPI/Torch.git # Pull the upstream staging branch
git fetch upstream staging
git reset --hard HEAD~1 # Remove the merge commit
git rebase upstream/staging
# If the above failed with merge conflicts, resolve them using a text editor.  Then do...
# git add -u
# git rebase --continue
git push -f  origin patch-1 # Force the remote branch to match the local branch
Gwindalmir commented 7 years ago

I'd also suggesting changing it so it uses mklink /J, as that does not require administrator privileges to run, while mklink /d does. I know you didn't add that originally, but it's so small, and related. :-)

szczepix commented 7 years ago

Do I have a valid pull request? @Phoenix84 I added your suggestion argument and it work's without administrator privileges.