Git's conflict resolution process

The following figure is the process by which I summarize a commit encounter conflict resolution.

1. Submit changes to your local workspace to your local repository

2. Pull the code from the remote repository and merge with the local warehouse (pulling = fetch + merge)

3. The code for the local warehouse is pushed back to the workspace, including the CONFILCT section

4. Resolve the conflict and then re-commit to the local warehouse

5. Push to the remote repository to complete a conflicting commit

Git's conflict resolution process