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

[Bruce Steers]

On Fri, 4 Feb 2022 at 15:52, Gianluigi <bagonergi at gmail.com> wrote:

>
>
> Il giorno ven 4 feb 2022 alle ore 15:08 Cristiano Guadagnino <
> criguada at gmail.com> ha scritto:
>
>>
>> Ok, things are somewhat clearer now.
>>
>> So, open a CLI in the ~/gambas directory (where you issued the "git pull"
>> command) and type:
>> git config --get remote.origin.url
>>
>> What do you get in reply?
>>
>> Cris
>>
>
> Sorry for the delay, the terminal indicates:
> https://gitlab.com/GianluigiOr/gambas.git
>

Do you set the upstream ?
as per instructions here
https://gitlab.com/gambas/gambas/-/blob/master/CONTRIBUTING.md

git remote add upstream https://gitlab.com/gambas/gambas.git

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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.gambas-basic.org/pipermail/user/attachments/20220204/f1612d6c/attachment.htm>