18.4 Working with Revision Control Systems
When you make changes to files outside of the IDE, conflicts can be created when you try to check these files into a revision control system. To solve these problems, see 8.9.2 Resolving Conflicts in Revision Controlled Files.