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

[Gianluigi]

Having obtained two git merge --abort and having complicated my life by
following these GitLab tips:

Step 1. Fetch and check out the branch for this merge request
git fetch "https://gitlab.com/GianluigiOr/gambas.git" "italian-translations"
git checkout -b "GianluigiOr/gambas-italian-translations" FETCH_HEAD
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin
git checkout "origin/master"
git merge --no-ff "GianluigiOr/gambas-italian-translations"
Step 4. Push the result of the merge to GitLab
git push origin "master"

without getting results...

I tried to delete Gambas from my remote repository (I had already done this
successfully in the past)
 1 -I went to my GitLab remote and I am accredited (Sign in)
 2 -I clicked on the personal project
 3 -On the left browser I clicked on Settings > General
 4 -I scrolled the page all the way down to see Advanced
 5 -I clicked on Expand
 6 -At the bottom there is the red Remove project button I clicked on it.
 7 -I confirmed the choice in a dialog by writing the name of the project
in the appropriate text box.
Unfortunately things have changed and a project can be eliminated only
after a week of reflection, hoping to speed up the times I eliminated the
Fork but without the desired result.
I reset Gambas from a special button but the fork would not know how to do
it (no button).

After this attempt, I deleted the repository on my disk, then gave the
following commands:

gian at gian:~$ git clone git at gitlab.com:GianluigiOr/gambas.git
gian at gian:~$ cd gambas
gian at gian:~/gambas$ git remote add upstream
https://gitlab.com/gambas/gambas.git
gian at gian:~/gambas$ git branch italian-translations
gian at gian:~/gambas$ git checkout italian-translations
gian at gian:~/gambas$ git pull
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=<remote>/<branch> italian-translations

gian at gian:~/gambas$ git pull upstream master
remote: Enumerating objects: 562, done.
remote: Counting objects: 100% (562/562), done.
remote: Compressing objects: 100% (241/241), done.
remote: Total 562 (delta 318), reused 562 (delta 318), pack-reused 0
Ricezione degli oggetti: 100% (562/562), 566.49 KiB | 1.11 MiB/s, done.
Risoluzione dei delta: 100% (318/318), completed with 43 local objects.
Da https://gitlab.com/gambas/gambas
 * branch                master     -> FETCH_HEAD
 * [nuovo branch]        master     -> upstream/master
Aggiornamento di 516de91f9..d0650b8de
error: Your local changes to the following files would be overwritten by
merge:
app/src/gambas3/.lang/it.po
Please commit your changes or stash them before you merge.
Aborting
gian at gian:~/gambas$ git status
Sul branch italian-translations
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")
gian at gian:~/gambas$ git add app/src/gambas3/.lang/it.po
gian at gian:~/gambas$ git pull upstream master
Da https://gitlab.com/gambas/gambas
 * branch                master     -> FETCH_HEAD
Aggiornamento di 516de91f9..d0650b8de
error: Your local changes to the following files would be overwritten by
merge:
app/src/gambas3/.lang/it.po
Please commit your changes or stash them before you merge.
Aborting
gian at gian:~/gambas$ git commit
[italian-translations a5b487f52] Contains new IDE Italian translations
 1 file changed, 458 insertions(+), 275 deletions(-)
gian at gian:~/gambas$ git push
fatal: Il branch corrente italian-translations non ha alcun branch upstream.
Per eseguire il push del branch corrente ed impostare remote come upstream,
usa

    git push --set-upstream origin italian-translations

gian at gian:~/gambas$ git push --set-upstream origin italian-translations
To gitlab.com:GianluigiOr/gambas.git
 ! [rejected]            italian-translations -> italian-translations
(non-fast-forward)
error: failed to push some refs to 'git at gitlab.com:GianluigiOr/gambas.git'
suggerimento: Updates were rejected because the tip of your current branch
is behind
suggerimento: its remote counterpart. Integrate the remote changes (e.g.
suggerimento: 'git pull ...') before pushing again.
suggerimento: See the 'Note about fast-forwards' in 'git push --help' for
details.

Now I find myself with a repository one year backwards and I don't know
what to do.

Any suggestions other than giving up on git?

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