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

[Christof Thalhofer]

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.


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/20200314/2e6b5d31/attachment-0001.sig>