Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

1
  • 5
    I think this is the perfect answer. Thank you. Cherry-pick is very risky. If you cherry-pick a commit X from branchB to branchA, and later if you make commit Y in branchB that changes what commit X did, and you later try to merge branchB to branchA , you will surely get merge conflict. Commented Apr 24, 2021 at 18:18