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

[Christof Thalhofer]

Am 15.03.20 um 11:08 schrieb Gianluigi:

>...

Please quote only relevant things, not all. I can see all earlier mails.
Thank you!

> New merge request: https://paste.c-net.org/PowwowVoice
> It seems that to make a merge request you need to be on different branches.

You have to create a merge request in
https://gitlab.com/gambas

not in
https://gitlab.com/GianluigiOr/gambas

But please read until end.

> I gave these commands:
> 
> $ git checkout -B italian-translations
> Switched to a new branch 'italian-translations'
> 
> $ git status
> On branch italian-translations
> nothing to commit, working tree clean
> 
> See gitk: https://paste.c-net.org/VinceyPinkie
> 
> Now I should pass the translations that I have on master to the
> italian-translations branch, can I make a cherry-pick on master?
>
> $ git cherry-pick master ???
>

Ok, I cannot see the working dir on your computer, but only the things
on Gitlab.

Your branch master there:
https://gitlab.com/GianluigiOr/gambas/-/commits/master

Is ahead of
https://gitlab.com/gambas/gambas

with one commit. This is great.

So now you can in Gitlab go to the Gambas repository:
https://gitlab.com/gambas/gambas

And there create the merge request to merge the single commit
401ce521e7b5c4b18a85c9af8e47a85d0beb6cd7 (in short: 401ce521)
which is in
https://gitlab.com/GianluigiOr/gambas/-/commits/master
so that Benoît can merge it.

Ok, please do it.

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

After that (but can also be done now): The branches
italian-translations and italian-traslations
are not needed any more. I would delete them and continue work on master
on the local computer.

This master on the local computer has to be rebased (or merged)
regularly from upstream/master.

If you do further changes commit them and then push them to
origin/master which is your personal fork of Gambas on Gitlab.

And then you can create further merge requests to integrate your work in
https://gitlab.com/gambas/gambas

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/20200315/ed4dc6bd/attachment.sig>