Child file changes
Child changes 1
Child changes 2
Child change 3
XXX
Commit-cherry
commit3
commit2
Revert "commit2"

This reverts commit fa42e25f909f5365e8706135542b2c083361595a.
Revert "commit3"

This reverts commit ef24c281aab34ccd231b387829dfd7335d073ea9.
commit2
Commit5
Revert "Commit5"

This reverts commit d0915ee326d64328e388b208f3def08a3474295a.
Commit4
Commit5
single conflict on child
Merge branch 'Child-branch!'