(resolve any merge conflicts if there are any) (on branch development)$ git merge master Therefore, your merge has broken the branching strategy.I generally like to merge master into the development first so that if there are any conflicts, I can resolve in the development branch itself and my master remains clean. Any further development to B is always going to cause issues. The problem is that after merging from B to A, what was now the A branch has become the AB branch. What you suggested, which is not advisable. You'll notice that in all acceptable cases, every branch always merges back into the branch they originally branched from. I whipped up some diagrams to help explain it. I will generally advise the second option as it keeps things clear (at the cost of some branch juggling), unless the A and B features are very small and can easily cohabitate in a single branch.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |