Git resolving conflicts

Conflicts arise when several members work on the same files. They always become visible after a pull or after a merge of a branch. The person who is currently pulling must then decide which change is saved as the last version.

In Anchorpoint you are mostly committing your files before resolving a conflict. This means, that files will never get lost. Resolving a conflict is simply deciding, what will be the latest version.