hi,
sorry, my fault. Now it should work.
Repository:
https://gitlab.com/MaxDroid42/tails
Branch: review-translate/duckduckgo_challenge
Commit: bce6c4ec12d2f3cb13e3bb5789e619d18b0b7c5d
cheers
max
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On 7 April 2018 5:58 PM, Muri Nicanor <muri@???> wrote:
> Hi max
>
> thanks for reviewing- but i cannot merge your branch, there is a merge
>
> conflict. If i look at
>
> https://gitlab.com/MaxDroid42/tails/commits/review-translate/duckduckgo_challenge
>
> i don't see my commits there. If you make changes based on a commit, you
>
> will have to merge that commit first- so you do:
>
> git checkout -b my-review-branch
>
> then you do:
>
> git merge branchtobereviewed (i.e.
>
> muri/review-translate/duckduckgo_challenge)
>
> and then you can change and commit and push
>
> cheers,
>
> muri
>
> On 04/07/2018 04:51 PM, Max wrote:
>
> > hi,
> >
> > thanks Muri. I made some small changes.
> >
> > Repository: https://gitlab.com/MaxDroid42/tails
> >
> > Branch: review-translate/duckduckgo_challenge
> >
> > Commit: 14f453c62c0739a4649df87409dadc6f81944b9c
> >
> > cheers
> >
> > max
> >
> > ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
> >
> > On 7 April 2018 2:32 PM, Muri Nicanor muri@??? wrote:
> >
> > > Hi,
> > >
> > > i've reviewed the translation and made some adjustments, please review:
> > >
> > > https://0xacab.org/muri/tails
> > >
> > > [review-translate/duckduckgo_challenge 8de0411f4c] reviewed and made
> > >
> > > some changes
> > >
> > > cheers,
> > >
> > > muri
> > >
> > > On 04/07/2018 01:43 AM, Max wrote:
> > >
> > > > hi,
> > > >
> > > > please review:
> > > >
> > > > Repository: https://gitlab.com/MaxDroid42/tails
> > > >
> > > > Branch: translate/duckduckgo_challenge
> > > >
> > > > Commit: 84a616ef95e827310299e4fa722f22690035e9d2
> > > >
> > > > thx and cheers
> > > >
> > > > max
> > > >
> > > > Tails-l10n mailing list
> > > >
> > > > Tails-l10n@???
> > > >
> > > > https://mailman.boum.org/listinfo/tails-l10n
> > > >
> > > > To unsubscribe from this list, send an empty email to Tails-l10n-unsubscribe@???.
> > >
> > > Tails-l10n mailing list
> > >
> > > Tails-l10n@???
> > >
> > > https://mailman.boum.org/listinfo/tails-l10n
> > >
> > > To unsubscribe from this list, send an empty email to Tails-l10n-unsubscribe@???.
> >
> > Tails-l10n mailing list
> >
> > Tails-l10n@???
> >
> > https://mailman.boum.org/listinfo/tails-l10n
> >
> > To unsubscribe from this list, send an empty email to Tails-l10n-unsubscribe@???.
>
> Tails-l10n mailing list
>
> Tails-l10n@???
>
> https://mailman.boum.org/listinfo/tails-l10n
>
> To unsubscribe from this list, send an empty email to Tails-l10n-unsubscribe@???.
