From b8ad701e2c5417f79d90eb930858a484f21e5ed1 Mon Sep 17 00:00:00 2001 From: alexwebgr Date: Wed, 16 Sep 2015 16:51:22 +0100 Subject: [PATCH 1/2] extended Contributing section --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 193e40d..01b58a8 100644 --- a/README.md +++ b/README.md @@ -53,5 +53,7 @@ Retrieve last known dweet for your Thing 1. Fork it 2. Create your feature branch (`git checkout -b my-new-feature`) 3. Commit your changes (`git commit -am 'Add some feature'`) -4. Push to the branch (`git push origin my-new-feature`) -5. Create new Pull Request +4. Push to the branch (`git push -u origin my-new-feature`) +6. Merge to master (`git checkout master`) (`git merge my-new-feature`) (`git push`) + although it is possible to create a pull request it is better keep 'master' in sync +7. Create new Pull Request From dd48ad691969c3ca2b4886d456eb83a9cc3e10e9 Mon Sep 17 00:00:00 2001 From: alexwebgr Date: Wed, 16 Sep 2015 16:52:07 +0100 Subject: [PATCH 2/2] extended Contributing section --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 01b58a8..85c7d3e 100644 --- a/README.md +++ b/README.md @@ -55,5 +55,5 @@ Retrieve last known dweet for your Thing 3. Commit your changes (`git commit -am 'Add some feature'`) 4. Push to the branch (`git push -u origin my-new-feature`) 6. Merge to master (`git checkout master`) (`git merge my-new-feature`) (`git push`) - although it is possible to create a pull request it is better keep 'master' in sync + although it is possible to create a pull request from different branches it is better keep 'master' in sync 7. Create new Pull Request