Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

docs(merge): fix formatting #11088

Merged
merged 1 commit into from
Jan 23, 2018
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions docs/guides/MERGE_REQUESTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<hr/>

###<a name="curl"></a> Bringing a pull request into your local git
### <a name="curl"></a> Bringing a pull request into your local git

To bring in a pull request, first create a new branch for that pull request:

Expand All @@ -27,7 +27,7 @@ If there are any conflicts, go to the [Dealing with conflicts](#conflicts) secti
If the merge succeeds, use `git diff origin/master` to see all the new changes that will happen
post-merge.

###<a name="squash"></a> Squashing everything into one commit
### <a name="squash"></a> Squashing everything into one commit

Before merging a pull request into master, make sure there is only one commit
representing the changes in the pull request, so the git log stays lean.
Expand Down Expand Up @@ -56,7 +56,7 @@ git pull --rebase origin master

This may cause conflicts, see below for how to deal with these.

###<a name="conflicts"></a> Dealing with conflicts
### <a name="conflicts"></a> Dealing with conflicts

Run the following to see which files are conflicted:

Expand Down Expand Up @@ -92,7 +92,7 @@ git add -A
git am --continue
```

###<a name="merging"></a> Merging with master
### <a name="merging"></a> Merging with master

Finally, after you've squashed the whole pull request into one commit and made sure
it has no conflicts with the latest master and tests are run, you're ready to merge it in.
Expand Down