On 23/12/14 12:24, Cristian Oneț wrote:
Hi,
It seems that you already figured this out. I don't know why rebasing
produced those conflicts. As a hint I always do a:
(master) $git format-patch origin/master --stdout
or
(4.7) $git format-patch origin/4.7 --stdout
before pushing anything just t
Hi,
It seems that you already figured this out. I don't know why rebasing
produced those conflicts. As a hint I always do a:
(master) $git format-patch origin/master --stdout
or
(4.7) $git format-patch origin/4.7 --stdout
before pushing anything just to make sure that every pushed commit is in
I've been cherry-picking a commit
e09e3467305aa926ba49852638b44ceb8089c318 from HEAD for 4.7, and after
the commit, on doing the rebase, I received the following -
"M kmymoney/kmymoney.appdata.xml
Falling back to patching base and 3-way merge...
Auto-merging kmymoney/kmymoney.appdata.xml
