Skip to content

Updated README to mention pull_request instead of alpher #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kodiack wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated README to mention pull_request instead of alpher #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,12 +332,12 @@ This will trigger a conflict which you will have to fix.
We now practise fixing merge conflicts. Recall that conflicts are caused
by merges which affect the same block of code.

Here’s a branch I prepared earlier. The branch is called `alpher`. Run
Here’s a branch I prepared earlier. The branch is called `pull_request`. Run
the code below to set it up (don’t worry if you can’t understand it)

$ git checkout alpher
$ git checkout pull_request

You should now have a new branch called `alpher`. Try merging that
You should now have a new branch called `pull_request`. Try merging that
branch into `master` now and fix the ensuing conflict.

![](https://upload.wikimedia.org/wikipedia/commons/thumb/4/44/Help-browser.svg/20px-Help-browser.svg.png)
Expand All @@ -348,7 +348,7 @@ Fixing a conflict

You should see a `conflict` with the `gamow.txt` file. This means that
the same line of text was edited and committed on both the master branch
and the alpher branch. The output below basically tells you the current
and the pull_request branch. The output below basically tells you the current
situation :

Auto-merging gamow.txt
Expand All @@ -365,16 +365,16 @@ below:

http://en.wikipedia.org/wiki/Stellar_nucleosynthesis
Stellar nucleosynthesis is the collective term for the nuclear reactions taking place in stars to build the nuclei of the elements heavier than hydrogen. Some small quantity of these reactions also occur on the stellar surface under various circumstances. For the creation of elements during the explosion of a star, the term supernova nucleosynthesis is used.
>>>>>>> alpher
>>>>>>> pull_request

Git uses pretty much standard conflict resolution markers. The top part
of the block, which is everything between `<<<<<< HEAD` and `======` is
what was in your current branch.\
The bottom half is the version that is present from the `alpher` branch.
The bottom half is the version that is present from the `pull_request` branch.
To resolve the conflict, you either choose one side or merge them as you
see fit.

For example, I might decide to choose the version from the `alpher`
For example, I might decide to choose the version from the `pull_request`
branch.

Now, try to **fix the merge conflict**. Pick the text that you think is
Expand Down