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

[Gianluigi]

Il giorno lun 9 mar 2020 alle ore 23:15 Gianluigi <bagonergi at gmail.com> ha
scritto:

>
>
> Il giorno lun 9 mar 2020 alle ore 22:42 Christof Thalhofer <
> chrisml at deganius.de> ha scritto:
>
>> 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
>>
>> Allright, that was, what we have done. We fixed
>> italian-traslations which is now equivalent with upstream/master.
>> ...
>> > italian-traslation is about the present time, while the master is one
>> > year behind.
>>
>> Because we didn't pull the changes into master.
>> ...
>>
>
> git pull upstream master it worked, see gitk image:
> https://paste.c-net.org/MementoDoesn
>
> Unfortunately on:
> $ git merge italian-traslation
> merge: italian-traslation - not something we can merge
>
> I suspend and go to sleep, if you think, we update tomorrow.
>
> Thank you and good night
> Gianluigi
>

Hi Christof,

I hope you still have the strength to follow my awkward steps in Git.

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

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.
To do this, I simply write to terminal:

git branch -d italian-traslations

Or is the matter more complex?

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?

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