INTRO
- A few days back, I faced this Git issue at work and I'd like to share it here.
- Some background - Git Forking workflow
- This is important because we developers have to work in teams and facing Git conflicts is inevitable. We often talk about major programming languages and frameworks, their quirks, and issues. And I feel we don't discuss Git as much as them even though it's a crucial part of working in a team.
BODY
- Define the problem
- Take backup clone first
- What is cherry-pick
- The solution
CONCLUSION
- There could be many solutions to this. If you have a better solution, I'd love to hear them :)
Top comments (0)