[Freedombox-discuss] update fork branch

James Valleroy jvalleroy at mailbox.org
Fri Jun 25 20:40:18 BST 2021

On 6/25/21 1:24 PM, Diederik de Haas wrote:
> On vrijdag 25 juni 2021 17:53:25 CEST Tiago Zaniquelli via Freedombox-discuss 
> wrote:
>> I have one question. I did an issue and it was aprroved and merged in main
>> project https://salsa.debian.org/freedombox-team/freedombox
>> So, How I do to update my local branch
>> (https://salsa.debian.org/zani0x03/freedombox) with all modifications done
>> in https://salsa.debian.org/freedombox-team/freedombox
> 'git remote -v' will tell you which remotes you have. The default remote is 
> named 'origin' and should point to your clone (on salsa).
> The following will add the canonical repo as a(nother) remote and that will be 
> named 'upstream':
> 'git remote add upstream https://salsa.debian.org/freedombox-team/freedombox'
> Make sure you're in your (local) master branch:
> 'git checkout master'
> Now 'pull', which is a shorthand for 'fetch' and 'merge' the changes from 
> 'upstream' into your local (master) branch:
> 'git pull upstream master'

This will likely result in a merge commit that does not exist in upstream/master.

I find more often what I want is to reset my local master branch to upstream/master.
And try to do work in feature branches / bugfix branches, rather than on master itself.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/freedombox-discuss/attachments/20210625/139afcd7/attachment.sig>

More information about the Freedombox-discuss mailing list