Change that will conflict with future cherry-pick from stable
Change that will conflict with future cherry-pick to development
Cherrypicking d311fccf07e84be31e6519e047fd64835d441083 from stable to development

Surprise:
What I thought to be a non-conflicting change (since I only changed one branch)
turns out to be conflicting anyway. Obvious in hindsight, because there was no
common history to help resolve this.

Conflicts:
	testfile.txt
Change that will conflict with future merge from stable
Change that will conflict with future merge to development
Merge branch 'stable' into development

Lesson:
- lines changed in both branches will always conflict, regardless
  of previous merge or cherry-pick history
- lines changed in the from branch, that also changed in a previous
  commit that was cherry-picked to the to branch conflict again
  because there's no common history for smart resolution

Conflicts:
	testfile.txt
Change that will conflict with future merge from stable
Change that will conflict with future merge to development
Merge branch 'stable' into development

Lesson learned:
- lines changed only in the from branch, that also changed in a previous
  commit that was merged into the to branch will not conflict again
  because the common history allows for smart resolution

Conflicts:
	testfile.txt
Oops, an accidental change on the wrong branch.
Let's cherry-pick it to the proper branch
And figure out how to restore git's notion of history
Oops, an accidental change on the wrong branch.
Let's cherry-pick it to the proper branch
And figure out how to restore git's notion of history
Merge branch 'stable' into development after chery-picking the same
commit from development into stable (it was on the wrong branch,
remember) ?

=> This is a clean merge

Lesson learned:
- if a commit went into the wrong branch (the target branch for merges)
  history can be preserved by cherry-picking the commit into the
  right branch and immediatly merging that branch back into the
  target branch