Workflow

Workflow

When dealing with a repository that may have multiple users change the repository you may run into conflicts.

Multi-user Commits

When you have multiple users working on the same file or same git repository, you will have issues.

For example, if you try to commit and push your changes you may see the following:

Just hit OK and close the Push window then go to the command prompt and type: git pull.

The Pattern

This pattern will help to minimize any conflicts:

1. Commit your changes locally first. Click on Commit only.

   

2. Pull any remote changes down.

   git pull

3. Push your changes up to the remote.

   git push

Links

• git - the simple guide

Exercises

1. TBD