Autor: flapflap
Data:
Dla: tails-l10n
Temat: Re: [Tails-l10n] [de] (review) doc summary
flapflap:
> Maybe u could fix that?
I think, u could do (may contain errors...):
git checkout de/docsummary
git branch backup
git reset --hard HEAD^
git reset --hard HEAD^
<re-apply my patch, or cherry-pick the commit>
git push <origin?> de/docsummary-try_2
<if everything is fine, delete branch backup>
# fix the master
git checkout master
git branch did-some-change-cleanup-here
git reset --hard HEAD^
git reset --hard HEAD^
git pull --ff-only <tails-origin> master
Cheers,
~flapflap