Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit c6f5b2a

Browse files
committed
Merge pull request #8717 from adobe/randy/update-nls-readme
Add directions for updating existing branch on github.com
2 parents 187c234 + a305956 commit c6f5b2a

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

src/nls/README.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,16 +152,23 @@ Someone on the Brackets team will review the pull request. If it's ok, it will
152152
be merged. If changes need to be made, the reviewer will post comments in the
153153
pull request which will send you an e-mail notification.
154154

155-
You should make updates in the `patch-1` branch in your github fork of brackets
155+
### Updating Existing Branch and Pull Request
156+
157+
If you need to make changes to an exsiting branch,
158+
you should make updates in the `patch-1` branch in your github fork of brackets
156159
so all of your changes for this update are in a single branch.
157160
Creating a new branch for every update makes it difficult for core team
158161
to see all changes at once, and can even create conflicts that are
159-
very difficult to resolve.
162+
very difficult to resolve. For example:
163+
164+
1. After submitting your pull request, look at the top where it says something like:
160165

161-
Follow the link in the notification e-mail to the pull request if you need
162-
to determine which branch to edit. Once in the branch, navigate to the file
163-
to edit (same as you would in main repo) and click "Edit" button.
164-
Make any changes following directions for Editing an Existing Translation.
166+
`user1` wants to merge 1 commit into `adobe:master` from `user1:patch-1`
167+
168+
2. Go to your github fork of brackets page: `github.com/user1/brackets`
169+
3. Click on the Branches Tab: `github.com/user1/brackets/branches`
170+
4. Click on the link to the branch: `github.com/user1/brackets/tree/patch-1`
171+
5. This is where you make changes to your `patch-1` branch.
165172

166173
Saved edits show up as a new commit, so they automatically show up in the original
167174
pull request. After making an update, add a comment to the pull request such as

0 commit comments

Comments
 (0)