Re: [Tails-l10n] (pull) [de] wiki/src/doc/anonymous_internet…

Üzenet törlése

Válasz az üzenetre
Szerző: Muri Nicanor
Dátum:  
Címzett: tails-l10n
Régi témák: [Tails-l10n] (review) [de] wiki/src/doc/anonymous_internet/networkmanager.de.po
Tárgy: Re: [Tails-l10n] (pull) [de] wiki/src/doc/anonymous_internet/networkmanager.de.po
hi,

i've reviewed the changes and everything is fine - please pull:
> https://gitlab.com/spriver/tails.git
> branch: de_networkmanager
> latest commit: 7785c9c3 Minor edit (remove "lokal" from "lokale
> Netzwerk(e)")



On 05/30/2015 10:50 PM, spriver wrote:
> I've got a general question to git, when a page get's updated and I've
> already got a branch which I worked on with that file, how do I import
> the modified page to my branch? (I did this now via a git pull from
> the tails master, but this fetches all)
> I hope it's understandable what I mean ;)

i've been told the recommended way of dealing with this situation is
rebasing: https://git-scm.com/book/en/v2/Git-Branching-Rebasing

cheers,
muri