Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: update branch to master #1511

Closed
wants to merge 1 commit into from
Closed

doc: update branch to master #1511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions COLLABORATOR_GUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ $ git rebase --abort
Checkout proper target branch

```text
$ git checkout v1.x
$ git checkout master
```

Update the tree

```text
$ git fetch origin
$ git merge --ff-only origin/v1.x
$ git merge --ff-only origin/master
```

Apply external patches
Expand All @@ -138,21 +138,21 @@ $ curl -L https://github.com/iojs/io.js/pull/xxx.patch | git am --whitespace=fix
Check and re-review the changes

```text
$ git diff origin/v1.x
$ git diff origin/master
```

Check number of commits and commit messages

```text
$ git log origin/v1.x...v1.x
$ git log origin/master...master
```

If there are multiple commits that relate to the same feature or
one with a feature and separate with a test for that feature -
you'll need to squash them (or strictly speaking `fixup`).

```text
$ git rebase -i origin/v1.x
$ git rebase -i origin/master
```

This will open a screen like this (in the default shell editor):
Expand Down Expand Up @@ -210,7 +210,7 @@ line.
Time to push it:

```text
$ git push origin v1.x
$ git push origin master
```

### I just made a mistake
Expand Down
2 changes: 1 addition & 1 deletion WORKING_GROUPS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# io.js Working Groups

io.js Working Groups are autonomous projects created by the
[Technical Committee (TC)](https://github.com/iojs/io.js/blob/v1.x/GOVERNANCE.md#technical-committee).
[Technical Committee (TC)](https://github.com/iojs/io.js/blob/master/GOVERNANCE.md#technical-committee).

Working Groups can be formed at any time but must be ratified by the TC.
Once formed the work defined in the Working Group charter is the
Expand Down