Check In the Results of One Merge At a Time

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

Check in the results of one merge before performing a second merge that involves the same files. After performing the first merge, compile the code and ensure that the unit tests succeed, and then check in your pending changes. Then begin the second merge and repeat the process.

This helps to reduce complexity and, by keeping the merges separate, enables you to undo changes if the need arises.

Additional Resources

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

Comments

No comments yet.