Author: elouann Date: To: tails-l10n Subject: Re: [Tails-l10n] [fr] Re: Review of the translations made by
Mercedes508
Hi,
intrigeri <intrigeri@???> :
> elouann wrote (14 Aug 2015 04:08:04 GMT) :
> > the branch now merges perfectly with origin/master,
>
> great! merged (resolved a minor conflict), pushed, thanks.
Thank you!
> > so hopefully the only problem left is this one:
>
> >> > * resolving the conflicts this way mixes up *in a single commit*
> >> > the modifications made during the conflict-merge and *all* the
> >> > differences pulled from origin/master. This is not what we
> >> > want, as this commit will be a pain to review. Unless I'm
> >> > missing a secret git command.
> >>
> >> I'm curious how you check/see that => please push the result of
> >> your merge.
>
> > I pushed in the branch elouann/fr-solve-conflicts.
>
> I've checked:
>
> git diff --stat c005e0f..elouann/fr-solve-conflicts
>
> (c005e0f is the parent commit from upstream's master branch that your
> merge from August 12 took)
>
> ... and I can't confirm what you wrote earlier. I see only changes
> introduced by the other parent commit of this merge.
>
> However, I see no merge commit on that branch from late July, so it
> seems that you didn't push the branch that exposed the problem
> initially, which doesn't help investigating, and thus I may be
> missing something.
I archived the problematic branch and will investigate if this problem
occurs again.
