[Gambas-user] I feel a deep resentment for git

[Gianluigi]

Il giorno ven 4 feb 2022 alle ore 17:50 Bruce Steers <bsteers4 at gmail.com>
ha scritto:

>
> How it should work....
> You fork gambas, you then download your own fork
> git pull depth=1 https://gitlab.com/GianluigiOr/gambas.git
> then cd the dir and issue command
> git remote add upstream https://gitlab.com/gambas/gambas.git
>
> Then from your fork if you are on the master branch then git pull will
> update as your master branch (activate automatic mirroring in gitlab
> settings)
>
> otherwise the command you need it this...
> git pull upstream master
>
> that will pull from gambas/gambas.git to whatever branch you are on in
> your local repository.
> if you are not on the master branch you then have to issue a 'git push' to
> push the pulled updates from master into your current branch on the remote.
>
> Hope that helps :)
>
> BruceS
>

Hi BruceS,

yes it helped me, I was able to merge, thank you

Benoit immediately incorporated it before I could mess it up :-D

Regards

Gianluigi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.gambas-basic.org/pipermail/user/attachments/20220204/38d1d80e/attachment.htm>