[Kmymoney-devel] mymoneystatementreader.cpp on 4.7
agander93 at gmail.com
Sat Dec 20 19:50:10 UTC 2014
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 -
Falling back to patching base and 3-way merge...
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,
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
Is it safe to push?
More information about the KMyMoney-devel