[Gambas-user] Git

[Jussi Lahtinen]

No, as I explained in the first post, there was no changes made by me.


Jussi




On Sat, Aug 11, 2018 at 10:54 PM, Christof Thalhofer <chrisml at deganius.de>
wrote:

> 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
>
>
>
> ----[ Gambas mailing-list is hosted by https://www.hostsharing.net ]----
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.gambas-basic.org/pipermail/user/attachments/20180812/a5115b6a/attachment.html>