Skill: Merge conflicts

[benthayer]

• Rename/Rename conflict
• Rename/Rename conflict with changes made on one end
• Rename/Rename conflict with changes made in both ends
• Adding a file in the directory that was moved, there won't be a merge conflicts, it'll just get removed

Solutions:

• Merge and resolve conflicts manually
• Don't merge, but move the folders manually, then the merge conflicts will automatically check for the files (This may also take care of the other extra files, but you have to be aware of the changes that occurred beforehand)
• Why aren't there tools for this? Git is the "dumb content tracker"
• Communication, frequent merges