[Gambas-user] How to keeping my repository up to date?

[Bruce Steers]

You must make a new branch from master on your fork and make edits to that.
then you submit the merge to gambas master of your new edited branch.

do not edit the protected "master" branch on your fork. make a new one.
I find this easiest to do on my gitlab page. just hit the "New branch"
option (make sure you create from master)

BruceS


On Fri, 13 Jan 2023 at 21:36, Martin <mbelmonte at belmotek.net> wrote:

> Hi,
> I made a fork in my gitlab repo and then I clone it
> git clone git at gitlab.com:belmotek/gambas.git
>
> I update the common Spanish translation (es.po) and then:
> git add .
> git commit -m "Spanish update"
> git push
> Then I made the merge request and more or less it works.
>
> Then: git remote add upstream https://gitlab.com/gambas/gambas.git
> git remote -v
> origin git at gitlab.com:belmotek/gambas.git (fetch)
> origin git at gitlab.com:belmotek/gambas.git (push)
> upstream https://gitlab.com/gambas/gambas.git (fetch)
> upstream https://gitlab.com/gambas/gambas.git (push)
> Then: git pull upstream master
>
> But I get (translated):
> remote: Enumerating objects: 698, done.
> remote: Counting objects: 100% (689/689), done.
> remote: Compressing objects: 100% (589/589), done.
> remote: Total 698 (delta 104), reused 651 (delta 97), pack-reused 9
> Receiving objects: 100% (698/698), 3.21 MiB | 2.95 MiB/s, done.
> Resolving deltas: 100% (106/106), completed with 7 local objects.
>  From https://gitlab.com/gambas/gambas
>   * branch master -> FETCH_HEAD
>   * [new branch] master -> upstream/master
> help: The branches have diverged and you need to specify how to
> reconcile them.
> help: You can do this by executing one of the following commands before the
> help: next pull:
> help:
> help: git config pull.rebase false # merge
> help: git config pull.rebase true # rebase
> help: git config pull.ff only # fast forward only
> help:
> help: "git config" can be replaced with "git config --global" to apply
> help: preference on all repositories. You can also pass
> help: --rebase, --no-rebase, or --ff-only in the command to override the
> help: default configuration on every invocation.
> fatal: need to specify how to reconcile diverging branches.
>
> ¿Any idea about how to proceed here?
>
> I try this
> git branch -a
> $ git branch -a
> * (sin rama)
>    remotes/origin/HEAD -> origin/master
>    remotes/origin/cmake
>    remotes/origin/evdev
>    remotes/origin/exclamation-mark-completion
>    remotes/origin/gb.chart2
>    remotes/origin/gb.git
>    remotes/origin/gb.joystick
>    remotes/origin/gb.net.imap
>    remotes/origin/gb.spreadsheet
>    remotes/origin/gb.test
>    remotes/origin/gb.test.tap
>    remotes/origin/master
>    remotes/origin/newdialogs
>    remotes/origin/stable
>    remotes/origin/wayland
>    remotes/upstream/master
>
> How is not a current branch (I guest) i set one by
> git checkout -b remote/origin/master
> then I try: git pull upstream master
> But this happens:
> Desde https://gitlab.com/gambas/gambas
>   * branch                master     -> FETCH_HEAD
> error: Los cambios locales a los archivos siguientes serían
> sobreescritos al fusionar:
>    app/src/gambas3/.icon.png app/src/gambas3/.lang/ar.po
> app/src/gambas3/.lang/ca.po app/src/gambas3/.lang/cs.po
> app/src/gambas3/.lang/cy.po app/src/gambas3/.lang/de.po
> app/src/gambas3/.lang/el.po app/src/gambas3/.lang/es.po
> app/src/gambas3/.lang/es_ES.po app/src/gambas3/.lang/fa.po
> app/src/gambas3/.lang/fr.po app/src/gambas3/.lang/gl_ES.po
> app/src/gambas3/.lang/hr.po app/src/gambas3/.lang/hu.po
> app/src/gambas3/.lang/id.po app/src/gambas3/.lang/it.po
> app/src/gambas3/.lang/ja.po app/src/gambas3/.lang/ko.po
> app/src/gambas3/.lang/lt.po app/src/gambas3/.lang/nl.po
> app/src/gambas3/.lang/no.po app/src/gambas3/.lang/pl.po
> app/src/gambas3/.lang/pt.po app/src/gambas3/.lang/pt_BR.po
> app/src/gambas3/.lang/ro.po app/src/gambas3/.lang/ru.po
> app/src/gambas3/.lang/sl.po app/src/gambas3/.lang/sv.po
> app/src/gambas3/.lang/tr.po app/src/gambas3/.lang/zh.po
> app/src/gambas3/.lang/zh_TW.po app/src/gambas3/.project
> Fusionar con estrategia ort falló.
>
>
> Then: git fetch --all
> Extrayendo origin
> Extrayendo upstream
> Desde https://gitlab.com/gambas/gambas
>   * [nueva rama]          cmake                       -> upstream/cmake
>   * [nueva rama]          evdev                       -> upstream/evdev
>   * [nueva rama]          exclamation-mark-completion ->
> upstream/exclamation-mark-completion
>   * [nueva rama]          gb.chart2                   -> upstream/gb.chart2
>   * [nueva rama]          gb.git                      -> upstream/gb.git
>   * [nueva rama]          gb.joystick                 ->
> upstream/gb.joystick
>   * [nueva rama]          gb.net.imap                 ->
> upstream/gb.net.imap
>   * [nueva rama]          gb.spreadsheet              ->
> upstream/gb.spreadsheet
>   * [nueva rama]          gb.test                     -> upstream/gb.test
>   * [nueva rama]          gb.test.tap                 ->
> upstream/gb.test.tap
>   * [nueva rama]          newdialogs                  ->
> upstream/newdialogs
>   * [nueva rama]          stable                      -> upstream/stable
>   * [nueva rama]          wayland                     -> upstream/wayland
>
> But the command "git pull upstream master" return warnings
>
> I'm going to stop editing with the current computer and I'm going to use
> a virtual machine to start again from scratch, but it is not viable in
> the long term to work like this, if someone can make a more detailed
> tutorial on how to proceed it would be very good for me.
> Thanks
> Martin
>
> ----[ http://gambaswiki.org/wiki/doc/netiquette ]----
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.gambas-basic.org/pipermail/user/attachments/20230113/dc6be1f8/attachment.htm>