Code

Make cherry-pick use rerere for conflict resolution.