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

Gianluigi bagonergi at gmail.com
Sat Mar 7 14:21:27 CET 2020


Il giorno sab 7 mar 2020 alle ore 01:03 Gianluigi <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.
  (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?

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


More information about the User mailing list