[Kmymoney-devel] Backporting to 4.7 (again)

[aga]

One day, I promise, I'll get this right, I hope.

This morning, I did two commits to HEAD for BUG 343757.  There were some 
conflicts to deal with, and in dealing with these, I omitted the --amend 
on one of the commits.  Hence the two commits.

Next, I wanted to backport t0 4.7.

I did the
git checkout 4.7
git fetch origin && git reset --hard origin/4.7,
but when I tried to 'git checkout to my working directory' I got a 
message saying that
'The previous cherry-pick is now empty, possibly due to conflict 
resolution.', which was probably reasonable in that I had done commits
and conflict resolution.

So, instead, I repeated the git checkout 4.7 and did the cherry-picks 
from there.

Anyway, now git status appears OK, but git log shows
commit e246a7c2be55dbaa29cc0296ec30f440f7ec7bd2
Author: Allan Anderson <agander93 at gmail.com>
Date:   Fri Feb 6 17:43:08 2015 +0000

     BUG:343757
     Fix crash when importing CSV investment file after editing settings

     (cherry picked from commit 8706b8724878258f11de713eff2422a2249c2a63)

     Conflicts:
         kmymoney/plugins/csvimport/investprocessing.cpp

commit 4eaadac232fa08c542050e0736d6b66fcb911b83
Author: Allan Anderson <agander93 at gmail.com>
Date:   Fri Feb 6 17:43:08 2015 +0000

     BUG:343757
     Fix crash when importing CSV investment file after editing settings.

     (cherry picked from commit a5cebcd383b6e4a1b30418a296ac0cd879b31395)

     Conflicts:
         kmymoney/plugins/csvimport/investprocessing.cpp

Again, there are conflicts mentioned, but I seen no sign of them now.

What I'm intending to do next is
git checkout 4.7
git pull -r origin 4.7
git checkout (what?)
git rebase 4.7
git checkout (what?)
git merge backportFixes
<-- git push origin 4.7
git push kde:kmymoney 4.7

Does this look OK, do we think, Or what should I do, please?

Thanks

Allan