Level 102
Yes that is the exact point of branches. You an always merge master into your branch when you are ready, fix conflicts etc, and then merge your branch into master
1 like
Feb 20, 2020
4
Level 14
Git and refactoring of code
Hello,
I have done a good progress on a project. But, I know there is a need to do a lot of refactoring.
I want to ask if I should create a new Git Branch from master branch to refactor the code?? Because refactoring can lead to many conflicts? Will it be possible to merge the refactor branch back to master?
Have you done such thing? Give me tips for refactoring using git. I do TDD.
Level 14
How about refactoring on master branch itself? @sinnbeck
Level 102
That would be bad practice. Imagine this. You start refactoring today but tomorrow you are still far from ready. Someone reports a bug, and you jump on that bug at once and fix it. You are now forced to deploy both the fix and a partial refractor
1 like
Level 14
@sinnbeck Yes. Thank you.
Please or to participate in this conversation.