77
88<hr />
99
10- ###<a name =" curl " ></a > Bringing a pull request into your local git
10+ ### <a name =" curl " ></a > Bringing a pull request into your local git
1111
1212To bring in a pull request, first create a new branch for that pull request:
1313
@@ -27,7 +27,7 @@ If there are any conflicts, go to the [Dealing with conflicts](#conflicts) secti
2727If the merge succeeds, use ` git diff origin/master ` to see all the new changes that will happen
2828post-merge.
2929
30- ###<a name =" squash " ></a > Squashing everything into one commit
30+ ### <a name =" squash " ></a > Squashing everything into one commit
3131
3232Before merging a pull request into master, make sure there is only one commit
3333representing the changes in the pull request, so the git log stays lean.
@@ -56,7 +56,7 @@ git pull --rebase origin master
5656
5757This may cause conflicts, see below for how to deal with these.
5858
59- ###<a name =" conflicts " ></a > Dealing with conflicts
59+ ### <a name =" conflicts " ></a > Dealing with conflicts
6060
6161Run the following to see which files are conflicted:
6262
@@ -92,7 +92,7 @@ git add -A
9292git am --continue
9393```
9494
95- ###<a name =" merging " ></a > Merging with master
95+ ### <a name =" merging " ></a > Merging with master
9696
9797Finally, after you've squashed the whole pull request into one commit and made sure
9898it has no conflicts with the latest master and tests are run, you're ready to merge it in.
0 commit comments