About keeping forked repository up to date

[Gaël Bonithon]

You don't have to add the upstream repository each time, only one time is sufficient.
Then, a shorthand for `git fetch upstream && git merge upstream/master` is `git pull upstream master` (I think this should rebase by default, else `git pull --rebase upstream master`).
Finally, `git push --force origin your-branch` should do the job.


Cheers,
Gaël


‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Wednesday, November 11, 2020 10:08 AM, Olivier Duchateau <duchateau.olivier at gmail.com> wrote:

> Hi,
>
> I wonder, what is the best way to keep its forked repository up to
> date, when we have new "branches".
>
> Recently I submitted several merge requests for Tumbler (each of them
> are new branch), one was committed, but others no.
>
> I follow these steps (on my local machine):
> git remote add upstream https://gitlab.xfce.org/xfce/tumbler.git
>
> result:
> git remote -v
> origin git at gitlab.xfce.org:OlivierDuchateau/tumbler.git (fetch)
> origin git at gitlab.xfce.org:OlivierDuchateau/tumbler.git (push)
> upstream https://gitlab.xfce.org/xfce/tumbler.git (fetch)
> upstream https://gitlab.xfce.org/xfce/tumbler.git (push)
>
> Then
> git fetch upstream
>
> Follow by
> git merge upstream/master
>
> Everything is fine, but now when I want to push my changes (I have fix
> for make distcheck pipeline, and other improvement) on my repository,
> process fails.
>
> Regards,
>
> -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
>
> olivier
>
> Xfce4-dev mailing list
> Xfce4-dev at xfce.org
> https://mail.xfce.org/mailman/listinfo/xfce4-dev