7
7
8
8
<hr />
9
9
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
11
11
12
12
To bring in a pull request, first create a new branch for that pull request:
13
13
@@ -27,7 +27,7 @@ If there are any conflicts, go to the [Dealing with conflicts](#conflicts) secti
27
27
If the merge succeeds, use ` git diff origin/master ` to see all the new changes that will happen
28
28
post-merge.
29
29
30
- ###<a name =" squash " ></a > Squashing everything into one commit
30
+ ### <a name =" squash " ></a > Squashing everything into one commit
31
31
32
32
Before merging a pull request into master, make sure there is only one commit
33
33
representing the changes in the pull request, so the git log stays lean.
@@ -56,7 +56,7 @@ git pull --rebase origin master
56
56
57
57
This may cause conflicts, see below for how to deal with these.
58
58
59
- ###<a name =" conflicts " ></a > Dealing with conflicts
59
+ ### <a name =" conflicts " ></a > Dealing with conflicts
60
60
61
61
Run the following to see which files are conflicted:
62
62
@@ -92,7 +92,7 @@ git add -A
92
92
git am --continue
93
93
```
94
94
95
- ###<a name =" merging " ></a > Merging with master
95
+ ### <a name =" merging " ></a > Merging with master
96
96
97
97
Finally, after you've squashed the whole pull request into one commit and made sure
98
98
it has no conflicts with the latest master and tests are run, you're ready to merge it in.
0 commit comments