When your ticket is finally QA approved and it's time to go on to the next environment, you may be ahead to just branch off your environment, doctor in your five changes, and merge back the new branch instead of merging in your five changes and one hundred things that have grown apart from modern realities over a few weeks' time. If you don't take this nuanced step and you try to merge in, let's say a dozen here and there changes in an Entity Framework .edmx which have nothing to do with the change you were attempting to begin with, expect things to fall down.
If you are spending two hours on a merge something is wrong. At this point you are ahead to splice instead of merge. Both things invite catastrophe but the splicing is better.
No comments:
Post a Comment