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 to make sure that every pushed commit is intended.
Regards,
Cristian
Yes, the commit was fine, so the problem was my sandbox. Eventually, I
realised that my initial pull of 4.7 was wrong. I've sorted that now.
Thanks, and for the other recent tidying up. I've been bogged down here.
Cheers and all the best.
Allan
2014-12-20 21:50 GMT+02:00 Allan <agande...@gmail.com>:
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
CONFLICT (content): Merge conflict in kmymoney/kmymoney.appdata.xml
Failed to merge in the changes.
Patch failed at 0001 SVN_SILENT made messages (after extraction)"
At the same time, In Kdevelop, I had mymoneystatementreader.cpp in a tab,
and it was flagging a mismatch on line 673 -
MyMoneyPrice price = file->price(currencyid, basecurrencyid,
statementTransactionUnderImport.m_datePosted, true);
This line was to be replaced as a const version. I've no idea where that
change came from, and it wasn't in my patches either. I haven't yet traced
its origin.
I've left the line unmodified, and I'll attend to the above mentioned
conflict.
Is it safe to push?
Allan
_______________________________________________
KMyMoney-devel mailing list
KMyMoney-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmymoney-devel
_______________________________________________
KMyMoney-devel mailing list
KMyMoney-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmymoney-devel
_______________________________________________
KMyMoney-devel mailing list
KMyMoney-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmymoney-devel
