From e274e37fc692bec833a89dfea5dff21b19fbadb4 Mon Sep 17 00:00:00 2001 From: Denisov21 Date: Mon, 11 Aug 2014 20:52:36 +0200 Subject: [PATCH 1/2] Update README.md Correct a word! --- src/nls/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nls/README.md b/src/nls/README.md index cdcae0f07e2..12f76494b4d 100644 --- a/src/nls/README.md +++ b/src/nls/README.md @@ -154,7 +154,7 @@ pull request which will send you an e-mail notification. ### Updating Existing Branch and Pull Request -If you need to make changes to an exsiting branch, +If you need to make changes to an existing branch, you should make updates in the `patch-1` branch in your github fork of brackets so all of your changes for this update are in a single branch. Creating a new branch for every update makes it difficult for core team From f2d9f010ac1a50dc06c64ec512c83cc39d725c48 Mon Sep 17 00:00:00 2001 From: Denisov21 Date: Mon, 11 Aug 2014 21:16:13 +0200 Subject: [PATCH 2/2] Update README.md --- src/nls/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nls/README.md b/src/nls/README.md index 12f76494b4d..c24b62617b9 100644 --- a/src/nls/README.md +++ b/src/nls/README.md @@ -137,7 +137,7 @@ for a new locale section for adding a new one. ### Branch and Pull Request For either case, if you have not yet forked the brackets repository in your github account (`https://github.com/user1/brackets`), it's done automatically. -A new branch will be created in your brackets fork with a unique name +A new branch will be created in your Brackets fork with a unique name which is something like `patch-1` that contains your changes. You are then taken to the New Pull Request dialog which is filled in @@ -145,7 +145,7 @@ with all of the information from previous dialog. It also shows contents of new file or a "diff" of changes to existing file. You can make any changes if desired, then click "Send Pull Request" when done (or close page to Cancel). -A pull request for your branch is created and submitted to the brackets "repo". +A pull request for your branch is created and submitted to the Brackets "repo". ### Code Review Someone on the Brackets team will review the pull request. If it's ok, it will @@ -155,7 +155,7 @@ pull request which will send you an e-mail notification. ### Updating Existing Branch and Pull Request If you need to make changes to an existing branch, -you should make updates in the `patch-1` branch in your github fork of brackets +you should make updates in the `patch-1` branch in your Github fork of Brackets so all of your changes for this update are in a single branch. Creating a new branch for every update makes it difficult for core team to see all changes at once, and can even create conflicts that are