Skip to content

Commit 773136c

Browse files
committed
Update Git_workflow_exercises.md
re-organize
1 parent f45127e commit 773136c

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Diff for: docs/guides/Git_workflow_exercises.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,21 @@
22

33
To get setup as a PhUSE CS contributor, see [Contributor_setup.md](https://github.com/phuse-org/phuse-scripts/blob/master/docs/guides/Contributor_Setup.md)
44

5-
Relevant roles for phuse-org/phuse-scripts are:
6-
1. Admin
7-
2. Developer
8-
3. ? [our repo teams](https://github.com/phuse-org/phuse-scripts/settings/collaboration) -- Owner? Admin? Is this the right setup?
9-
105
### Objective
116
Script GitHub workflow exercises for CSS 2016.
127

13-
### Git workflow tutorials
14-
15-
* [Atlassian Git Workflows](http://www.atlassian.com/git/tutorials/comparing-workflows)
16-
* [Learn git on Codecademy](http://www.codecademy.com/learn/learn-git)
17-
188
### GitHub Roles
199

2010
[GitHub article on Repository Permission Levels](https://help.github.com/articles/repository-permission-levels-for-an-organization/)
2111

2212
1. phuse-or/phuse-scripts Maintainers: can change master code
2313
2. GitHub Contributors: can create "pull request" from their own branch, for the Maintainers to review
2414

15+
Relevant roles for phuse-org/phuse-scripts?
16+
1. Admin
17+
2. Developer
18+
3. ? [our repo teams](https://github.com/phuse-org/phuse-scripts/settings/collaboration) -- Owner? Admin? Is this the right setup?
19+
2520
#### phuse-or/phuse-scripts Setup
2621

2722
* Master branch is always "production ready"
@@ -43,3 +38,8 @@ Script GitHub workflow exercises for CSS 2016.
4338
3. "pull" changes from master branch
4439
4. resolve any conflicts
4540
5. "pull request" ... screenshots
41+
42+
### Git workflow tutorials
43+
44+
* [Atlassian Git Workflows](http://www.atlassian.com/git/tutorials/comparing-workflows)
45+
* [Learn git on Codecademy](http://www.codecademy.com/learn/learn-git)

0 commit comments

Comments
 (0)