We have worked on a complex feature with my colleague in a common branch and during that time, there were several branches already merged into master. I can not resolve his conflicts and he cannot resolve mines, so we have to share the task. We don't work in the same place. I have two ideas. One is to create a new branch and cherry-picking my commits to it, then merge this one only. The other is to manually copy the directories containing my work from the feature branch outside the repository and back into a new branch. I am sure you have better ideas. Thanks in advance.
1 Answers
Related