You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/development.md
+15-18Lines changed: 15 additions & 18 deletions
Original file line number
Diff line number
Diff line change
@@ -62,28 +62,25 @@ The following is a poetic presentation of the protocol in code form.
62
62
#### [Shelhamer's](https://github.com/shelhamer) “life of a branch in four acts”
63
63
64
64
Make the `feature` branch off of the latest `bvlc/master`
65
-
```
66
-
git checkout master
67
-
git pull upstream master
68
-
git checkout -b feature
69
-
# do your work, make commits
70
-
```
65
+
66
+
git checkout master
67
+
git pull upstream master
68
+
git checkout -b feature
69
+
# do your work, make commits
71
70
72
71
Prepare to merge by rebasing your branch on the latest `bvlc/master`
73
-
```
74
-
# make sure master is fresh
75
-
git checkout master
76
-
git pull upstream master
77
-
# rebase your branch on the tip of master
78
-
git checkout feature
79
-
git rebase master
80
-
```
72
+
73
+
# make sure master is fresh
74
+
git checkout master
75
+
git pull upstream master
76
+
# rebase your branch on the tip of master
77
+
git checkout feature
78
+
git rebase master
81
79
82
80
Push your branch to pull request it into `BVLC/caffe:master`
83
-
```
84
-
git push origin feature
85
-
# ...make pull request to master...
86
-
```
81
+
82
+
git push origin feature
83
+
# ...make pull request to master...
87
84
88
85
Now make a pull request! You can do this from the command line (`git pull-request -b master`) if you install [hub](https://github.com/github/hub). Hub has many other magical uses.
0 commit comments