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

[Gianluigi]

Il giorno sab 14 mar 2020 alle ore 22:34 Gianluigi <bagonergi at gmail.com> ha
scritto:

>
>
> Il giorno sab 14 mar 2020 alle ore 20:12 Christof Thalhofer <
> chrisml at deganius.de> ha scritto:
>
>> Am 14.03.20 um 15:18 schrieb Gianluigi:
>>
>> > I hope you still have the strength to follow my awkward steps in Git.
>>
>> For sure!
>>
>> > These are my branches:
>> >   italian-traslations
>> > * master
>> >
>> > this is the master status:
>> > On branch master
>> > Your branch is ahead of 'origin/master' by 621 commits.
>> >   (use "git push" to publish your local commits)
>> > nothing to commit, working tree clean
>>
>> Look, it says, what should be done.
>> So please do a git push.
>>
>> > and this is the status of italian-traslations:
>> > On branch italian-traslations
>> > Your branch is up to date with 'origin/italian-traslations'.
>> > nothing to commit, working tree clean
>> >
>> > If I understand correctly, I could only work with the master.
>>
>> You can, if you want to. I would do that, only if you want to try
>> something new this would be a reason to create another branch.
>>
>> > To do this, I simply write to terminal:
>> >
>> > git branch -d italian-traslations
>>
>> Yes. If there are commits in there which would be lost, it would
>> complain about that. So just do it and watch what happens.
>>
>> > Or is the matter more complex?
>>
>> No.
>>
>> > If I am alone with master, I just need to import the latest translations
>> > (saved in backup) and do:
>> > add, commit and push
>> >
>> > then ask for merge, correct?
>>
>> Yes.
>>
>
> Hi Christof,
> it seems to have worked (*), except that when I get to the merge GitLab
> replies:
> Sorry, your filter produced no results (
> https://paste.c-net.org/TeamworkLifetime )
> Can you help me fix the filter?
> I've already tried it to no avail
>
> Regards
> Gianluigi
>
> (*) deleting branch 'italian-traslations' that has been merged to
>          'refs/remotes/origin/italian-traslations', but not yet merged to
> HEAD.
> Ramo italian-traslations eliminato (era a40d381d5).
>
> And:
>
> $ git push
> Counting objects: 101, done.
> Delta compression using up to 8 threads.
> Compressing objects: 100% (100/100), done.
> Writing objects: 100% (101/101), 17.22 KiB | 2.46 MiB/s, done.
> Total 101 (delta 81), reused 0 (delta 0)
> remote: Resolving deltas: 100% (81/81), completed with 43 local objects.
> To gitlab.com:GianluigiOr/gambas.git
>    516de91f9..401ce521e  master -> master
>
>
Hi Christof,
New merge request: https://paste.c-net.org/PowwowVoice
It seems that to make a merge request you need to be on different branches.
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 ???

otherwise?

I await your instructions :-)

Regards
Gianluigi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.gambas-basic.org/pipermail/user/attachments/20200315/5f0ead5e/attachment.html>