How I Learned
to Love Pre-Merging
Dragon--M.C. Escher (Click to see full size)
Pre-merging your work can save you (as well as your friendly neighborhood buildmeister) a lot of headaches caused by conflicts between your changes and simultaneous changes to the same file by other engineers. Pre-merging means to merge your changes with someone else's before submitting your work to the buildmeister to be merged back to the main branch.
You will find that pre-merging will most often
pick up these kinds of conflicts:
There can be other, more unusual conflicts also, but we will discuss these two cases, as they will give you a firm, straightforward understanding of how to pre-merge to resolve conflicts.
Here is a short story that shows why you should always pre-merge your work.
And here is a simple, reliable way to pre-merge.
This completes our introduction to Pre-merging. We highly recommend that you make it a standard part of your review before submitting work to the Buildmeister for merging to the main branch of development (usually /main).
