Git Kata 7: Collaboration as Carrie
Learn about two contributors pushing commits to a shared repository.
We'll cover the following...
Step 3: Make changes as Carrie and push
In the Carrie window below is the command to open a file in the text editor:
nano storelist.htm
Command's Parameters
Command / Parameter | Description |
| This opens the text editor. |
| This is the file to be edited. |
Carrie opens her copy of storelist.htm in her local repository.
To change and save the file:
- Replace “Enter list here…” with three items out of order from the Main List.
- Save the changes.
Carrie is in a hurry, so she grabs a few items from the Main List and throws them into the Next List without taking the time to put them in the correct order. Ken will have to take care of that later.
The command to commit the changes is given below.
git commit -a -m "Adding some items, list is out of order"
Command's Parameters
Command / Parameter | Description |
| This creates a new commit in the repository. |
| This stages all the modified files to the index prior to creating the commit. |
| The |
| This is the commit message. |
Carrie commits her additions to storelist.htm to the index of her local repository.
The output of the command is:
Output
Message | Meaning |
"[master 3072226] Adding some items, list is out of order" | This is the branch, commit hash, and commit message of the commit |
"1 file changed, 5 insertions(+), 2 deletions (-)" | This is a summary of the changes included in the commit (the next line is output from the text editor and can be ignored). |
The command to push the changes is given below.
git push -u origin master
- Enter “carrie.coder” as username (if prompted for username).
- Enter “katas” as a password.
Carrie attempts to push her changes to the remote repository, but the push is rejected. The message is very explicit and explains exactly why the push was rejected: Git will reject a push if the local branch is missing commits that are present in the remote. If this push were accepted, it would be “out of order” in the remote’s history, and Ken’s changes wouldn’t be present in future commits. It’s possible to force a push, but for obvious reasons, that’s usually ...