Re: Re: GitHub
By: Nelgin to Tony Langdon on Wed Aug 26 2020 11:45 am
Ne> But you still end up overwriting anything you changed whether you get the
Ne> latest zip or whether you pull the latest direct from git.
Actually, for git - git pull doesnt overwrite local changes.
If git finds that a pull will change files that have been modified locally, it
will refuse to checkout the pull. In which case, you may need to "git stash"
your changes for the pull to complete, and then "git stash pop" to re-apply
your changes and manually resolve any conflicts.
I actually do this a lot, since I develop on my laptop and fix on the server,
and changes on my laptop are often not yet committed to git...
...лоеп
... I'm not the one that misplaced the Deltivid asteroid belt!
---
ю Synchronet ю Alterant | an SBBS in Docker on Pi!
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
|