fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-25 14:52:17 +00:00
Code Issues Projects Releases Wiki Activity

contributing guide typos (#1831)

Browse Source 
* contributing guide typos

* fix git remote cmd
This commit is contained in:
Rigel 2018-06-29 03:09:16 -04:00 committed by Anton Kaliaev
parent 41733b46b9
commit 58acbf5ee3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CONTRIBUTING.md
View File

@ -17,7 +17,7 @@ Instead, we use `git remote` to add the fork as a new remote for the original re
For instance, to create a fork and work on a branch of it, I would: For instance, to create a fork and work on a branch of it, I would:
* Create the fork on github, using the fork button. * Create the fork on github, using the fork button.
* Go to the original repo checked out locally (ie. `$GOPATH/src/github.com/tendermint/tendermint`) * Go to the original repo checked out locally (i.e. `$GOPATH/src/github.com/tendermint/tendermint`)
* `git remote rename origin upstream` * `git remote rename origin upstream`
* `git remote add origin git@github.com:ebuchman/basecoin.git` * `git remote add origin git@github.com:ebuchman/basecoin.git`
@ -47,7 +47,7 @@ get_vendor_deps`). Even for dependencies under our control, dep helps us to
keep multiple repos in sync as they evolve. Anything with an executable, such keep multiple repos in sync as they evolve. Anything with an executable, such
as apps, tools, and the core, should use dep. as apps, tools, and the core, should use dep.
Run `dep status` to get a list of vendored dependencies that may not be Run `dep status` to get a list of vendor dependencies that may not be
up-to-date. up-to-date.
## Vagrant ## Vagrant
@ -85,7 +85,7 @@ especially `go-p2p` and `go-rpc`, as their versions are referenced in tendermint
- the latest state of development is on `develop` - the latest state of development is on `develop`
- `develop` must never fail `make test` - `develop` must never fail `make test`
- no --force onto `develop` (except when reverting a broken commit, which should seldom happen) - no --force onto `develop` (except when reverting a broken commit, which should seldom happen)
- create a development branch either on github.com/tendermint/tendermint, or your fork (using `git add origin`) - create a development branch either on github.com/tendermint/tendermint, or your fork (using `git remote add origin`)
- before submitting a pull request, begin `git rebase` on top of `develop` - before submitting a pull request, begin `git rebase` on top of `develop`
### Pull Merge Procedure: ### Pull Merge Procedure:
@ -110,7 +110,7 @@ especially `go-p2p` and `go-rpc`, as their versions are referenced in tendermint
- make the required changes - make the required changes
- these changes should be small and an absolute necessity - these changes should be small and an absolute necessity
- add a note to CHANGELOG.md - add a note to CHANGELOG.md
- bumb versions - bump versions
- push to hotfix-vX.X.X to run the extended integration tests on the CI - push to hotfix-vX.X.X to run the extended integration tests on the CI
- merge hotfix-vX.X.X to master - merge hotfix-vX.X.X to master
- merge hotfix-vX.X.X to develop - merge hotfix-vX.X.X to develop