It takes time to resolve conflicts, so you should make an effort to avoid them. There are both soft and hard methods that you can use for this. The soft methods are procedural (ways in which you agree to work in your team), and the hard methods are technical; they are implemented using the capabilities of your version control tool.

The first soft method is to take the approach recommended in the previous chapter and split your application into a number of separate workspaces connected via ADF Libraries. If you do this, you have already reduced the risk of version conflicts significantly.

The second soft method you can use is to assign owners to the files that are often the source of version conflicts. If you decide that only Bob, the lead programmer, is allowed to commit changes to the two files that the whole team keeps fighting over, he can keep the purpose and entire structure clear in his mind. If anybody else needs to make a change, they can tell Bob and let him make...