How to resolve conflicts?
Conflicts do not occur very often. Yet, they arise when working with versioning systems to protect you from overwriting your teammates changes. When you edit a file, your teammates changes are merged with your changes automatically by the versioning system in Springloops. When you want to update your working copy with a change of a line which has been also changed by someone else, a conflict occurs. By conflict you are asked to choose which changes should apply – your or your teammates changes edited at the same time. You need to resolve this conflict to be able to commit your changes. You can do it manually or with your Subversion client.
Related Questions
- Can we get the names and contact information of other churches that have used Peacemakers to resolve congregational conflicts?
- Is the disclosure and attestation form sufficient to identify and resolve conflicts of interest?
- Does the U.S. government try to resolve conflicts before they rise to the level of retaliation?
