A little game

Preparation

You should find a partner to do this part so that you are two people: Alice and Bob (pick up the one you like).

  1. Alice must add Bob as a “Maintainer” of one of her project.
  2. Bob clone the project on his computer

Here, Alice and Bob both works on the same branch master.

Scenario 1: Everything goes right

  1. Bob commit some changes and pushes them
  2. Alice pull the changes

Scenario 2: Everything goes wrong

  1. Alice commit some changes on her computer (do not pushes them!)
  2. Bob also commit some different changes on a different part (no conflict!)
  3. Alice pushes
  4. Bob tries to push (and fails miserably)
Solve this problem so that Bob’s change are now on the server! Alice then pull the project and check if everything is fine.

Scenario 3: Everything goes really (really) bad

  1. Alice commit some changes on her computer (do not pushes them!)
  2. Bob also commit some changes on the same part than Alice
  3. Bob pushes
  4. Alice tries to push (and fails miserably)
  5. Alice pulls and… conflict!
Solve this issue and make Alice’s change saved on the server!
Précédent
Suivant