What non-interactive git command(s) achieve the change from Before to After (where BC is a merge commit)
Before:
A---B---C---D
After:
B---C
/ \
A-------BC---D'
Here's what I'd do:
$ git branch to-merge-in C-commit-ID # Create a branch at C
$ git reset --hard A-commit-ID # Reset current branch to A
$ git merge --no-ff to-merge-in # Merge in branch. Create a merge commit.
$ git cherry-pick D-commit-ID # Grab the commit D
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With