Re: [Tails-l10n] (pullj)[de] Tails 2.2 translations

Poista viesti

Vastaa
Lähettäjä: Muri Nicanor
Päiväys:  
Vastaanottaja: tails-l10n
Vanhat otsikot: Re: [Tails-l10n] (review)[de] Tails 2.2 translations
Aihe: Re: [Tails-l10n] (pullj)[de] Tails 2.2 translations
hi

On 03/28/2016 06:18 PM, spriver wrote:
> Muri Nicanor:
>> merge conflict ;)
>
> I can't reproduce the conflict, I pulled into a test branch after I
> pulled from the Tails main repo. Maybe you can provide me some more
> info? Thanks! (:

i got:
> Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po
> CONFLICT (content): Merge conflict in

wiki/src/doc/anonymous_internet/Tor_Browser.de.po
> Auto-merging wiki/src/doc/about/warning.de.po
> CONFLICT (content): Merge conflict in wiki/src/doc/about/warning.de.po
> Auto-merging wiki/src/doc/about/trust.de.po
> CONFLICT (content): Merge conflict in wiki/src/doc/about/trust.de.po
> Auto-merging wiki/src/doc/about/features.de.po
> CONFLICT (content): Merge conflict in wiki/src/doc/about/features.de.po
> Automatic merge failed; fix conflicts and then commit the result.


but it works if i merge into a fresh branch, so it seems to be oke.
please pull:
https://gitlab.com/spriver/tails.git
branch: review-de_tails_202_doc
HEAD commit: a2882c0 Added comma

cheers,
--
muri