© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
(Get the code!)
Thinking more about it, the options may be better understood with:
1 - prefer mine,
2 - prefer theirs,
3 - manually solve each conflicted region,
4 - keep mine,
5 - take theirs