git 101 Ex3 - Estia-advanced-programming/pandora-public GitHub Wiki
As in the Ex 2, every members will edit the same file. But this time, you will create branches
to minimize conflict and facilitate merging.
You have decided to update the team members information. You will modify the README and add some information about yourself.
- Make sure that your local copy is up to date, if not pull any modification from the remote repository.
- Create a new local branch (call it
your_name_ex3
)
Fig. 1 That's here
- Click on "Bring my changes to 'branch_name'" and validate 'switch branch'
- Publish your branch on the remote directory
Fig. 2 That's here
- Modify the README file, add some elements about yourself in the team member section.
- Commit your modification (Make sure you are on the new branch you just created!)
- If you are not first in the list move yourself up.
- Commit your modification
- WAIT for the other to have commited their change locally
- push your commit(s) to the remote
- WAIT