javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1547 from pra85/patch-1

Browse Source 
Fix typos in source-control.md
This commit is contained in:
Vladimir Enchev
2016-02-15 09:24:17 +02:00
parent 887a15e547 7e37bb85a4
commit 50c5d5ce93
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source-control.md
View File

@ -1,6 +1,6 @@
#Working with source control
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).
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).
***
### (!) Important - Before you start
@ -80,12 +80,12 @@ When you are finished working on your feature branch, you need to create a Pull
* 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**.
* Once your Pull Request is reviewed and accepted you can merge it. **You should rebase** your branch in order to maintain clean history.
* Merging:
- 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.
- 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.
- using the GitHub web interface, click the "Merge" button
* Delete the remote branch after merge
# Release Branch Managemant
# Release Branch Management
On the end of every milestone a "release" branch is created in the Icenium repository to stabilize the build for the upcoming release.
@ -117,7 +117,7 @@ git push origin release
```
## Fixing bugs during stabilization
###I have a change that has to be applied to to the release. What should I do?
###I have a change that has to be applied to the release. What should I do?
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.
@ -138,7 +138,7 @@ describe the intent and the approach.
### Summary:
* Summary is the first line of the message. This is the line that'll be seen most often, make it count.
* Summary *should* be around 50 chars and **must** be less than 72 (Github max lenght before wrap).
* Summary *should* be around 50 chars and **must** be less than 72 (Github max length before wrap).
* 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.
* Avoid ending the summary line with a period
* Leave a blank line after the summary (and between other paragraphs).