I wonder if there is the way to copy one commit to another branch without checking out that branch.
For example, I have two branches: master
and parallel_version
.
I'm on parallel_version
branch and I found a bug in file common for these branches.
I've fixed it and committed. How to duplicate this commit to another branch, assuming I'm using git-svn?
Normally I would do:
$ git checkout master
$ git cherry-pick parallel_version
$ git checkout parallel_version
Is there better way of doing that?
That's not possible - simply imagine what would happen if there was a conflict that couldn't be resolved automatically. For the same reason you also can't update branches that are not currently checked-out (even if a fast-forward was possible).
https://github.com/lennartcl/gitl provides "git cherry-copy" and "git cherry-move" scripts that do this and handle most of the corner cases.
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