Be Careful When Resolving Merge Conflicts

- J.D. Meier, Jason Taylor, Alex Mackman, Prashant Bansode

Be careful when merging because it is easy to make mistakes that may result in build instability. When merging files:
  • Double-check the code you are merging before committing the merges.
  • Test that you can compile the resulting merged file before checking it back into source control.
  • Verify that the associated unit tests run and succeed before checking the merged file back into source control.
  • Make sure that you understand the nature of the changes made by another developer. If you are in doubt about merging some lines, talk to the developer who made the other changes so that you are sure of their purpose and to get a second view on the impact of your merge.

After you have finished merging, compile the resulting source and run unit tests to test for major breaks.

Additional Resources

Last edited Jul 26, 2007 at 9:25 AM by prashantbansode, version 3


No comments yet.