Re: [Tails-dev] On re-entry of I2P into Tails

Delete this message

Reply to this message
Autore: intrigeri
Data:  
To: Masayuki Hatta, tails-dev
Nuovi argomenti: Re: [Tails-dev] On re-entry of I2P into Tails
Oggetto: Re: [Tails-dev] On re-entry of I2P into Tails
Masayuki Hatta:
> I'm still a bit confused. The second command gives me something like:

[...]
> I guess "git push -u origin" might fix this, is this correct?


Yes.

> Also, I'm not sure how I can sync my local (topic) branch with the
> upstream (the original Tails repo, not my forked one) devel branch.
> Does "git fetch upstream" in the topic branch do the trick?


After git fetch you'll need to merge recent changes from
upstream/devel into your topic branch:

git checkout $topic_branch && \
git fetch upstream && \
git merge upstream/devel

:)

Cheers,
--
intrigeri