Conclusion

Congratulations! You were able to:

• understand how, when, and why merge conflicts happen
• compare similar changes from different developers
• work as a team to resolve conflicts
• utilize local tools to carefully manage source code changes