[Gambas-user] Let me ask you a question about Git and GitLab

[Christof Thalhofer]

Am 09.03.20 um 13:50 schrieb Gianluigi:

> And after:
> 
> $ git pull upstream master
> Da https://gitlab.com/gambas/gambas
>  * branch                master     -> FETCH_HEAD
> Merge made by the 'recursive' strategy.
>  comp/src/gb.web.form2/.src/Test/Webform1.webform |  2 +-
>  comp/src/gb.web.form2/.src/WebForm.class         | 48
> +++++++++++++++---------
>  comp/src/gb.web.form2/style.css                  |  1 +
>  main/lib/debug/CDebug.c                          | 12 ++++++
>  main/lib/debug/debug.c                           |  4 ++
>  main/lib/debug/debug.h                           |  1 +
>  6 files changed, 49 insertions(+), 19 deletions(-)

Ok now you should commit your changes as always and then do a

$ git push

Please tell me if that worked.

---------------------------------------------------------------

So ... all you needed was "git pull upstream master". But normally
better is a

$ git rebase upstream master

if you have commits in your workdir (which are not pushed!).

If you have a problem, you always can copy the whole workdir (all except
the hidden directory .git) to another place to make a backup. Then reset
the workdir to an older version:

$ git reset --hard $HashOfOlderVersion

then

$ git pull upstream master

to make it similar to the original Gambas.

And then copy your changes from the backup over it, then commit, then push.

You should learn mostly everything about these essential Git commands:
fetch, pull, push, merge, stash, branch, rebase and reset.

If you have done that you will never have any problem any more. Not with
women, not with children, not with age or drugs. And obviously not with
Git repositories.

> Let's hope that's true, because as a child I broke everything and as you
> know the old people return to children.

Git will prevent that. Just transform yourself into a Git repository.
Git heals everything!  ;-)

Alles Gute

Christof Thalhofer

-- 
Dies ist keine Signatur

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