[Phpmyadmin-devel] troubles merging QA_4_0 in master

[Dieter Adriaenssens]

I had some merging issues, I hope I did it all correctly. Please check
if I did something wrong along the way, and advise how I could have
done it better :

2013/6/4 Dieter Adriaenssens <dieter.adriaenssens at gmail.com>:
> Hi,
>
> I fixed an issue in QA_4_0 and wanted to merge it to master, so I
> followed the guidelines on merging translations before committing the
> fix to QA_4_0 and merging it to master, in order to make sure that
> both branches were in sync. [0]
> So far so good.
>
> Then I commited my change [1], and merged it with master [2]. There was a

merge conflict, which I resolved. So far so good.

When pushing my changes to master and QA_4_0 someone had translated a
string in the mean time, so I did a git pull --rebase, but this caused
a diverged branch, so I did a git pull (without rebase) and pushed
again, and then it was all OK.
Or so it seems. Can anyone check if this is the case?

I would like to commit another change on the master branch, which
changes a translateable string, but I won't do this before I know
everything is fine with the branches.

Thanks.

> [0] https://github.com/phpmyadmin/phpmyadmin/commit/93a08acb80cbf76f0a7822b1c7480f78bf228412
> [1] https://github.com/phpmyadmin/phpmyadmin/commit/7a3c15724ab86af78f2f2475cfaea0470ab0f073
> [2] https://github.com/phpmyadmin/phpmyadmin/commit/c6fd32f85d65c7b295b0bc1cdd6d8fd17e411d7f
> --
> Kind regards,
>
> Dieter Adriaenssens



--
Kind regards,

Dieter Adriaenssens