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

[Christof Thalhofer]

Am 07.03.20 um 14:21 schrieb Gianluigi:

> Il giorno sab 7 mar 2020 alle ore 01:03 Gianluigi <bagonergi at gmail.com
> <mailto:bagonergi at gmail.com>> ha scritto:
> 
>     ...
> 
>  
> After solving various conflicts and pulling "italian-translations" this
> is my situation on my remote:
> ---------------------------------------------
> gian at gian:~/gambas$ LANG=C git status
> On branch italian-translations
> Your branch is ahead of 'origin/italian-translations' by 497 commits.

Hmm, this looks a bit weird.

>   (use "git push" to publish your local commits)
> 
> Changes not staged for commit:
>   (use "git add <file>..." to update what will be committed)
>   (use "git checkout -- <file>..." to discard changes in working directory)
> 
> modified:   app/src/gambas3/.lang/it.po
> 
> no changes added to commit (use "git add" and/or "git commit -a")
> -----------------------------------------------------
> 
> See also here gitk image https://paste.c-net.org/WalkmanLeveled
> 
> Any suggestions on how to proceed?

In situations I do not understand any more I do this:
(be careful, not tested!)

I copy the whole workdir to another place to backup my work.

$ cp -r ./gambas /var/tmp
(be careful, not tested!!!!)

Then I do

$ cd ./gambas
$ git stash
to put my changes out of the way

Then I checkout an older version, for instance
$ git checkout bfc455070e9b94dd7

Then pull

$ git pull
$ git checkout master

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

Now there is the current version on the computer.

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

After that you can copy the backup over this version, then commit and
push your changes as usual.


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/20200307/0a3a7655/attachment.sig>