I’ve been using SCMs (SVN, Git) for a while and their merge robustness’ always been puzzling. Sometimes automated merges work, and sometimes they don’t. Are there general rules on what will automatically merge and what won’t?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I’ve been using SCMs (SVN, Git) for a while and their merge robustness’ always been puzzling. Sometimes automated merges work, and sometimes they don’t. Are there general rules on what will automatically merge and what won’t?
Essentially a merge will fail when a line is edited that was also edited by someone else or they edited an adjacent line. Git is a little better then subversion for resolving merge conflicts. To help avoid conflicts commit as often as possible (on each atomic change you make to the source is ideal).
Also see Resolving a Merge Conflict