4 Jun
2013
4 Jun
'13
2:56 p.m.
2013/6/4 Michal Čihař <michal(a)cihar.com>om>:
Hi
Dne Tue, 4 Jun 2013 11:14:23 +0200
Dieter Adriaenssens <dieter.adriaenssens(a)gmail.com> napsal(a):
Thanks for the checking.
--
Kind regards,
Dieter Adriaenssens
2013/6/4 Dieter Adriaenssens
<dieter.adriaenssens(a)gmail.com>om>:
git pull --rebase is not something you want to do after merging remote
branch - just do git pull in that case.
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.
Both branches look good.