From 9aa2737bd8f51dc008801b0c40c0646a6442509d Mon Sep 17 00:00:00 2001 From: Alana Erickson Date: Mon, 28 Oct 2019 14:09:02 -0400 Subject: [PATCH 1/9] Updates README for legibility --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a53fe0f..8170dd0 100644 --- a/README.md +++ b/README.md @@ -48,9 +48,9 @@ git remote add 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 -```adsadad -s +git push 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 ``` From 7001e66a4329d68cabdc29d4e9732c7b0867b9ec Mon Sep 17 00:00:00 2001 From: Alana Erickson Date: Mon, 28 Oct 2019 14:10:45 -0400 Subject: [PATCH 2/9] Updates README for even more legibility --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8170dd0..bce7537 100644 --- a/README.md +++ b/README.md @@ -101,8 +101,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 @@ -116,7 +116,7 @@ You will be demonstrating your knowledge of GitHub workflow and Scrum fundamenta 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. From 28634a54cc165f00194d6f32810b842d08b58b41 Mon Sep 17 00:00:00 2001 From: TK Farewell Date: Mon, 28 Oct 2019 16:36:08 -0400 Subject: [PATCH 3/9] TK made a change --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bce7537..8762e4e 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ This assignment will help in understanding how to use GitHub to collaborate with * [Forking the repository](#forkingasdsadsadaddaborating-with-github) * [Assignment](#assignment) +## TK ADDED THIS ## Common Git Commands From 5ddf8b6fab70eb5dca396906b01a9d78c8e9f10b Mon Sep 17 00:00:00 2001 From: TK Farewell Date: Mon, 28 Oct 2019 16:38:26 -0400 Subject: [PATCH 4/9] removed useless line --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 8762e4e..ec5152d 100644 --- a/README.md +++ b/README.md @@ -7,8 +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) - -## TK ADDED THIS ## Common Git Commands From 7aec8a84e95af6da86e2f553e6c66331aad2925c Mon Sep 17 00:00:00 2001 From: Baker Griffith Date: Mon, 28 Oct 2019 16:49:03 -0400 Subject: [PATCH 5/9] Removed annoying message --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index ec5152d..9e7ccfa 100644 --- a/README.md +++ b/README.md @@ -123,5 +123,3 @@ You will be demonstrating your knowledge of GitHub workflow and Scrum fundamenta 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: From e09671660305adb42b91e282dee36e921b3709eb Mon Sep 17 00:00:00 2001 From: Baker Griffith <37988041+bak3m3acak3@users.noreply.github.com> Date: Mon, 28 Oct 2019 16:52:47 -0400 Subject: [PATCH 6/9] Set theme jekyll-theme-midnight --- _config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 _config.yml diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..1885487 --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-midnight \ No newline at end of file From 608470888205785834deef57679a7376f3f4ba44 Mon Sep 17 00:00:00 2001 From: TK Farewell Date: Mon, 28 Oct 2019 16:52:57 -0400 Subject: [PATCH 7/9] added tk branch and tk.txt --- tk.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 tk.txt diff --git a/tk.txt b/tk.txt new file mode 100644 index 0000000..a571ef3 --- /dev/null +++ b/tk.txt @@ -0,0 +1 @@ +created a tkbranch woo! \ No newline at end of file From a8dad64adf312d20387154d073339f51c7cae4c7 Mon Sep 17 00:00:00 2001 From: Alana Erickson Date: Mon, 28 Oct 2019 17:31:12 -0400 Subject: [PATCH 8/9] Adds group name to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9e7ccfa..50d2778 100644 --- a/README.md +++ b/README.md @@ -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) From 542dc29319f3280afa532145e379b0752a6d9786 Mon Sep 17 00:00:00 2001 From: Baker Griffith Date: Mon, 28 Oct 2019 17:46:57 -0400 Subject: [PATCH 9/9] Removed blank line --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 50d2778..f2e05da 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,6 @@ 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: 1. Create a GitHub organization for your team. Fork this repository to that organization.