[Gambas-user] Git

[Christof Thalhofer]

Am 11.08.2018 um 16:16 schrieb Jussi Lahtinen:

> Yes, thanks! However it wasn't applicable to my situation.

Yes. Because you did a git reset --hard and threw away the changes.

What I described, was exactly your situation. If it happens next time
please use the commandos as I wrote:

git status
git stash
git pull
git stash apply
git status

Never use git reset --hard without investigating what was the reason
that git refused to merge the remote changes.

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/20180811/1d97580e/attachment.sig>