4 Jun
2013
4 Jun
'13
11:07 a.m.
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
[0] https://github.com/phpmyadmin/phpmyadmin/commit/93a08acb80cbf76f0a7822b1c748... [1] https://github.com/phpmyadmin/phpmyadmin/commit/7a3c15724ab86af78f2f2475cfae... [2] https://github.com/phpmyadmin/phpmyadmin/commit/c6fd32f85d65c7b295b0bc1cdd6d... -- Kind regards,
Dieter Adriaenssens