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

[Gianluigi]

Il giorno lun 9 mar 2020 alle ore 13:11 Christof Thalhofer <
chrisml at deganius.de> ha scritto:

> Am 09.03.20 um 12:11 schrieb Gianluigi:
>
> >     git status
> > ...
> > modified:   app/src/gambas3/.lang/it.po
>
> Ok, this is easy. You just have modified this single file. Please copy
> it elsewhere for backup reasons.
>

OK done.

This one you should update that it's state is equal to the master branch
> of Gambas:
>
> $ git pull upstream master
> (or as I am a little unsure:
>    $ git pull upstream
> )
>
> Please tell me the output of this command.
>

$ git pull upstream
remote: Enumerating objects: 249, done.
remote: Counting objects: 100% (249/249), done.
remote: Compressing objects: 100% (64/64), done.
remote: Total 325 (delta 185), reused 231 (delta 184), pack-reused 76
Ricezione degli oggetti: 100% (325/325), 102.51 KiB | 452.00 KiB/s, done.
Risoluzione dei delta: 100% (219/219), completed with 45 local objects.
Da https://gitlab.com/gambas/gambas
 * [nuovo branch]        cmake          -> upstream/cmake
 * [nuovo branch]        evdev          -> upstream/evdev
 * [nuovo branch]        exclamation-mark-completion ->
upstream/exclamation-mark-completion
 * [nuovo branch]        gb.chart2      -> upstream/gb.chart2
 * [nuovo branch]        gb.git         -> upstream/gb.git
 * [nuovo branch]        gb.joystick    -> upstream/gb.joystick
 * [nuovo branch]        gb.net.imap    -> upstream/gb.net.imap
 * [nuovo branch]        gb.spreadsheet -> upstream/gb.spreadsheet
 * [nuovo branch]        gb.test        -> upstream/gb.test
 * [nuovo branch]        gb.test.tap    -> upstream/gb.test.tap
 * [nuovo branch]        jit-with-c     -> upstream/jit-with-c
   30cde24a5..1a0809095  master         -> upstream/master
 * [nuovo branch]        qt5ext-2       -> upstream/qt5ext-2
 * [nuovo branch]        stable         -> upstream/stable
 * [nuova tag]           3.14.0         -> 3.14.0
 * [nuova tag]           3.14.1         -> 3.14.1
 * [nuova tag]           3.14.2         -> 3.14.2
 * [nuova tag]           3.14.3         -> 3.14.3
You asked to pull from the remote 'upstream', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.

And after:

$ git pull upstream master
Da https://gitlab.com/gambas/gambas
 * branch                master     -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 comp/src/gb.web.form2/.src/Test/Webform1.webform |  2 +-
 comp/src/gb.web.form2/.src/WebForm.class         | 48
+++++++++++++++---------
 comp/src/gb.web.form2/style.css                  |  1 +
 main/lib/debug/CDebug.c                          | 12 ++++++
 main/lib/debug/debug.c                           |  4 ++
 main/lib/debug/debug.h                           |  1 +
 6 files changed, 49 insertions(+), 19 deletions(-)


>
> > I am an idiot, I await your instructions before making things worse :-(
>
> ROTFL :-)
> No you are not! :-)
>

I have the certificate !


> Git is a git (Il nome Git significa stupido, [this is from deepl.com]).
> The beauty of it is that it is made so that you can hardly break
> anything with it.
>

Let's hope that's true, because as a child I broke everything and as you
know the old people return to children.

:-)))

Thank you and regards

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