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: source-control.md
+5-5Lines changed: 5 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,6 +1,6 @@
1
1
#Working with source control
2
2
3
-
As a reference point, you might find it usefull to check the following [Git tutorial](http://rogerdudler.github.io/git-guide/) and the [Git cheatsheet] (http://www.git-tower.com/files/cheatsheet/Git_Cheat_Sheet_grey.pdf).
3
+
As a reference point, you might find it useful to check the following [Git tutorial](http://rogerdudler.github.io/git-guide/) and the [Git cheatsheet] (http://www.git-tower.com/files/cheatsheet/Git_Cheat_Sheet_grey.pdf).
4
4
5
5
***
6
6
### (!) Important - Before you start
@@ -80,12 +80,12 @@ When you are finished working on your feature branch, you need to create a Pull
80
80
* If you need to make additional changes push them again to the same branch. **You should rebase** your branch in order to maintain clean history about the changes (comments will not be lost). You can also squash your commits accordingly. After you make the changes **you need again 2 ThumbUp-s and a green build**.
81
81
* Once your Pull Request is reviewed and accepted you can merge it. **You should rebase** your branch in order to maintain clean history.
82
82
* Merging:
83
-
- manually - please use the `--no-ff` option if there are more than one commits to merge. otherwize, do a fast-forward merge as the merge commit adds no value.
83
+
- manually - please use the `--no-ff` option if there are more than one commits to merge. otherwise, do a fast-forward merge as the merge commit adds no value.
84
84
- using the GitHub web interface, click the "Merge" button
85
85
* Delete the remote branch after merge
86
86
87
87
88
-
# Release Branch Managemant
88
+
# Release Branch Management
89
89
90
90
On the end of every milestone a "release" branch is created in the Icenium repository to stabilize the build for the upcoming release.
91
91
@@ -117,7 +117,7 @@ git push origin release
117
117
```
118
118
119
119
## Fixing bugs during stabilization
120
-
###I have a change that has to be applied to to the release. What should I do?
120
+
###I have a change that has to be applied to the release. What should I do?
121
121
122
122
You have to commit your changes only on the release branch. The release branch will be merged into master occasionally and your changes will end up in master after all.
123
123
@@ -138,7 +138,7 @@ describe the intent and the approach.
138
138
139
139
### Summary:
140
140
* Summary is the first line of the message. This is the line that'll be seen most often, make it count.
141
-
* Summary *should* be around 50 chars and **must** be less than 72 (Github max lenght before wrap).
141
+
* Summary *should* be around 50 chars and **must** be less than 72 (Github max length before wrap).
142
142
* Write the summary line and description of what you have done in the imperative mode, that is as if you were commanding someone. Write “fix”, “add”, “change” instead of “fixed”, “added”, “changed”. This is the convention by the messages generated by git commands, so committing after git revert will yield a consistent message.
143
143
* Avoid ending the summary line with a period
144
144
* Leave a blank line after the summary (and between other paragraphs).
0 commit comments