9504 shaares
222 private links
222 private links
git merge-base branch1 branch2 will find the common ancestor commit of two branches.
Tip : check that only one commit is applied out of each command
git log branch1..common
git log branch2..common- Cherry-pick the fix commit in a new branch (based on a common ancestor of the 2 branches) which will be then merged into them.
- Partial fix will be the same technique but the merge will be reverted in the feature branch before merging the feature branch in the master (see this)
