Commit 169388ef authored by Eliot Berriot's avatar Eliot Berriot

Update 2019-03-05-building-sotfware-together-with-git.markdown

parent 205e2944
Pipeline #2836 passed with stages
in 25 seconds
......@@ -192,10 +192,10 @@ You don't *have to* use GitHub if you're using git, but both tend to be used tog
When Bob forks Alice's repository, on GitHub, he ends up with an exact copy of her repository. It's Git's equivalent of "sending your thesis by email to a friend".
So, Bob has a working repository, and starts adding some commits on the master branch:
So, Bob has a working repository, and starts adding some commits on the `improvements` branch he created especially for that purpose:
```
| Bob's workspace / master branch
| Bob's workspace / improvements branch
|
| (previous commits omitted)
|
......@@ -217,7 +217,7 @@ So, Bob creates the Pull Request:
> Hello Alice!
>
> I'd like to merge the branch `master` from my repository into the `master` branch of your repository
> I'd like to merge the branch `improvements` from my repository into the `master` branch of your repository
>
> I've added one commit that fixes a typo, and one commit that improves the performance.
>
......@@ -229,7 +229,7 @@ When Alice receives that pull request, she'll be able to review Bob's commits, a
During the code review, Alice will read the changes introduces by Bob's commit, suggest some changes, and when she's satisfied with the result, accept the pull request.
Accepting the pull request will merge Bob's `master` branch into the `master` branch in her repository:
Accepting the pull request will merge Bob's `improvements` branch into the `master` branch in her repository:
```
......@@ -241,9 +241,9 @@ Accepting the pull request will merge Bob's `master` branch into the `master` br
|
* Commit from day 13: Alice edited lines 5 to 9 (from experiment branch)
|
* Commit from day 14: Bob edited lines 8 (from bob/master branch)
* Commit from day 14: Bob edited lines 8 (from bob/improvements branch)
|
* Commit from day 15: Bob deleted line 12 (from bob/master branch)
* Commit from day 15: Bob deleted line 12 (from bob/improvements branch)
|
```
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment