Hi, using git flow I would be more in favor for the rebase strategy, I think conflict resolving should be the responsibility of the developer adding the feature. It's part of the cost of developing it. However, it is essential to rebase all the time and do non breaking and microcommits, I suggest doing a rebase many times a day to handle conflicts a little at a time. Moreover, a feature branch should merge with the dev branch and not last more than three days at most to mutualize code and sharing value. This should prevent never ending conflicts
No comments yet.