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

[Christof Thalhofer]

Am 09.03.20 um 19:11 schrieb Gianluigi:

> it didn't go well.

No.

> I think the problem starts from Master who doesn't advance:
> -----------------------------------------------------------
> $ git status
> Sul branch italian-traslations
> Your branch is up to date with 'origin/italian-traslations'.
> 
> nothing to commit, working tree clean

Allright, that was, what we have done. We fixed
italian-traslations which is now equivalent with upstream/master.

> $ gitk
> $ git checkout master
> Si è passati al branch 'master'
> Your branch is up to date with 'origin/master'.

> $ gitk
> ------------------------------------------------------------------------
> italian-traslation is about the present time, while the master is one
> year behind.

Because we didn't pull the changes into master.

Do:

$ git checkout master

Then you can:

$ git pull upstream master

and/or

$ git merge italian-traslation

to make your master equivalent to upstream/master.

And then you can push it to origin/master:

$ git push

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/69cff62e/attachment.sig>