We did refactoring and now we want to merge the refactoring branch into the master, but there are a lot of conflicts, what is the best solution in this situation? Is it possible to replace the master branch?
|
1 answer
It is not clear that you are investing in the concept of “replacing a master branch”, but the branch “master” is no different from any other branch. It just so happened historically that the main release branch is called master. It can be called differently, just as a branch with that name may not be at all (there are projects without a master branch on a githaba). So you can not inject anything anywhere, but simply designate the branch where you refactored.
Enikeyshchik Enikeyshchik
7,028 five 9 27
|