minus-squareSinfaen@beehaw.orgtoProgramming@beehaw.org•How often do you have to resolve merge conflicts?linkfedilinkarrow-up1·edit-22 years agoMy team practices rebasing instead of merging, but generally our tasks are pretty separate so conflicts are uncommon. The ones that we do have are not that big. However I am anticipating more of them now that we’re changing build systems linkfedilink
My team practices rebasing instead of merging, but generally our tasks are pretty separate so conflicts are uncommon. The ones that we do have are not that big.
However I am anticipating more of them now that we’re changing build systems