[Gambas-user] Git

[Christof Thalhofer]

Am 10.08.2018 um 21:46 schrieb PICCORO McKAY Lenz:
> some files not in git ignored are generated, can do two things:
> 
> 1) "git status" ahd will show what files what changed, if wants to see
> changes use "git diff",
> 2) "git reset --hard" and all the spurius changes will be discarting to
> last commit upstream

This is bad because it will throw away all changes in the working dir.

Therefor Git recommends to execute:

git stash

Which will move the local changes to the stash (buffer).

https://git-scm.com/book/en/v1/Git-Tools-Stashing

Then you can do git pull and eventually

git stash apply


Alles Gute

Christof Thalhofer

-- 
Dies ist keine Signatur

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.gambas-basic.org/pipermail/user/attachments/20180810/c58a48d6/attachment.sig>