<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Il giorno lun 9 mar 2020 alle ore 09:40 Christof Thalhofer <<a href="mailto:chrisml@deganius.de">chrisml@deganius.de</a>> ha scritto:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello Gianluigi,<br>
<br>
please quote only relevant things ... and not all ever happened.<br></blockquote><div><br></div><div>OK sorry <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
Am 08.03.20 um 23:07 schrieb Gianluigi:<br>
<br>
> sorry I'm late, but I did a thousand tests based on your suggestions<br>
> These are the last commands given:<br>
> ...<br>
> $ git clone git@gitlab.com:GianluigiOr/gambas.git<br>
<br>
Uh, I didn't know you are working with your own forked repo. This makes<br>
it more complicated, and I doubt, that we could solve it by mail easily.<br>
There are three repos involved, I believe:<br>
<br>
upstream: <a href="https://gitlab.com/gambas/gambas.git" rel="noreferrer" target="_blank">https://gitlab.com/gambas/gambas.git</a><br>
origin: <a href="https://gitlab.com/GianluigiOr/gambas" rel="noreferrer" target="_blank">https://gitlab.com/GianluigiOr/gambas</a><br>
And the one on your computer.<br>
<br>
Can you paste here the output of:<br>
<br>
git status<br>
<br></blockquote><div>$ LANG=C git status<br>On branch italian-traslations<br>Your branch is up to date with 'origin/italian-traslations'.<br><br>Changes not staged for commit:<br>  (use "git add <file>..." to update what will be committed)<br>  (use "git checkout -- <file>..." to discard changes in working directory)<br><br>     modified:   app/src/gambas3/.lang/it.po<br><br>no changes added to commit (use "git add" and/or "git commit -a")<br><br>I also add:<br><br>$ git branch<br>* italian-traslations<br>  master</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
And the content of .git/config in the Gambas directory on your computer.<br></blockquote><div><br></div><div>Content of .git/config:<br><br>[core]<br>    repositoryformatversion = 0<br>   filemode = true<br>       bare = false<br>  logallrefupdates = true<br>[remote "origin"]<br>  url = git@gitlab.com:GianluigiOr/gambas.git<br>   fetch = +refs/heads/*:refs/remotes/origin/*<br>[branch "master"]<br>      remote = origin<br>       merge = refs/heads/master<br>[remote "upstream"]<br>      url = <a href="https://gitlab.com/gambas/gambas.git">https://gitlab.com/gambas/gambas.git</a><br>   fetch = +refs/heads/*:refs/remotes/upstream/*<br>[branch "italian-traslations"]<br>       remote = origin<br>       merge = refs/heads/italian-traslations</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
> This is the current situation on my remote:<br>
> <a href="https://gitlab.com/GianluigiOr/gambas/-/commits/65dd322acf1f6e66c4b4db6ebf7fda488a29c092" rel="noreferrer" target="_blank">https://gitlab.com/GianluigiOr/gambas/-/commits/65dd322acf1f6e66c4b4db6ebf7fda488a29c092</a><br>
<br>
There are two branches:<br>
italian-traslations and italian-translations<br></blockquote><div><br></div><div>I am an idiot, I await your instructions before making things worse :-(<br><br>Regards<br>Gianluigi <br></div></div></div>