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.

If you are using Git Rebase (see Workspace Settings > Git > Pull Merge Operation), you will need to resolve multiple conflicts against your local commits. This means that if you have four local commits, Git will check the remote changes against each of your local commits, showing you the conflict dialog four times.