Playful Programming @playfulprogramming.com · May 28 Conflicts are very common in Git operations, specially considering all the branches and potential issues that may arise when collaborating with others with code. In this chapter, we tackle the most common cases and their fixes!
0 likes 1 replies
?
Replies
Cherry-picking lets you take certain commits and apply them to another branch. This is useful if you want to merge certain commits without merging potentially breaking, sweeping changes alongside them.