Skip to content
techb4
Tag:
cherry-pick
Resolving Cherry-Pick Git Conflicts with Incoming Changes
August 23, 2016
techb4
0
troubleshoot
It’s as easy as pie: git cherry-pick --strategy=recursive -X theirs {hash}
Read More
cherry-pick
git
git conflicts