u:
> Hey,
>
> still another file which needs review
> wiki/src/doc/introduction.de.po
>
> on branch de-introduction.
(see below)
> (sorry, i got some problems finding commit numbers after having made a
> merge, maybe somebody has a technique to teach me? that would be highly
> appreciated :))
Usually, I do it via
git log --oneline master..HEAD > ~/bla; cat ~/bla
and in bla are the commit IDs and log messages.
If I do that for de-introduction I get:
68214dd Merge branch 'master' into de-introduction
3495882 merge
b202be4 Merge branch 'master' of
https://git-tails.immerda.ch/tails
a6b37b1 merge
2ec3824 initial translation
What is confusing me a lot in branch de-introduction and de-more-support
(and also is the reason that I couldn't do the review yet) is that your
451f/master branch is different from tails/master. I'm not sure if
differs in its content or only logically (e.g. in gitk it's shown as
different branch than the tails/master remote branch).
What's additionally confusing are the (resolved) merge conflicts that
touch files that are not related to the translation file (e.g. mdwn, or
already translated files).
I'm trying to figure out how you repo works, but don't know if I'll
succeed...
