Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 7 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# workflow
# workflow for Group 1
This assignment will help in understanding how to use GitHub to collaborate with your team members.

* [Common Git Commands](#common-git-commands)
Expand All @@ -7,7 +7,6 @@ This assignment will help in understanding how to use GitHub to collaborate with
* [Remote repositories](#remote-repositories)
* [Forking the repository](#forkingasdsadsadaddaborating-with-github)
* [Assignment](#assignment)


## Common Git Commands

Expand Down Expand Up @@ -48,9 +47,9 @@ git remote add <remote_name> <remote_uri>
Once you've made changes to your code and commited the results, you may want to add those changes to your repository on GitHub. We can **push** the local changes to a remote repository with the command

```
git push <remote_name> <branch_name>
```adsadad
s
git push <remote_name> <branch_name> adsadads
```

Say your team members have made contributions to the codebase and have pushed those changes to GitHub. In order to get those changes on your local repository, you must **pull** changes from a remote repository using

```
Expand Down Expand Up @@ -101,8 +100,8 @@ The **scrum master** ultimately merges the pull request into the master branch.

You will be demonstrating your knowledge of GitHub workflow and Scrum fundamentals in this assignment. You will be making simple changes to the sample to-do app that was shown in discussions and lecture. The Scrum Master will assign these tickets/tasks to the team. **All** members of the team must complete 1 ticket/task. There may be more tasks than you have group members, in that case it is **fine** to not do a task. Just make sure that every team member does one task.

####Tasks/tickets
######Accomplish these tasks in whatever way you see fit. No limitatons.
#### Tasks/tickets
###### Accomplish these tasks in whatever way you see fit. No limitatons.

1. Change the background color of the to-do app
2. Give the option to assign a priority to a to-do item
Expand All @@ -115,14 +114,11 @@ You will be demonstrating your knowledge of GitHub workflow and Scrum fundamenta
- This number should change when items are added / deleted (duh).
6. A button to clear all "completed" tasks


#####In order to complete these tasks, you will need to:
##### In order to complete these tasks, you will need to:

1. Create a GitHub organization for your team. Fork this repository to that organization.
2. You will not need to use Pivotal Tracker to track your tasks/user stories/tickets for this assignment.
2. Follow the timeline and tasks described [here](collaborating.pdf).
3. Make sure to follow the workflow. Create a new branch for each task, and make pull requests to merge changes into your code base.
4. At the end, your forked version of this repo should have had 5/6 (or more) completed pull requests to merge branches for each feature update into the master branch.
- Your repo's master branch should have the updated code (in the todo-src directory) to reflect each task/ticket.

Have fun! :sunglasses: :+1:
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-midnight
1 change: 1 addition & 0 deletions tk.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
created a tkbranch woo!