Welcome Glorious Geckos!

Welcome to Glorious Practice for our project workflow!

This is the workflow that we will use in our Sprints while we are sharing codebases each other. I am assuming that:

You have a GitHub account.
You have installed Git to your computer and connected with GitHub account.
You have installed Git Bash or some kind of command line to your computer.
You know how Git works. Which means that:
- You know the basic concepts of Git. What commits and branches are.
- You know git status, git add, git commit and git push
- If you don't know, please visit these links:
  - https://www.youtube.com/watch?v=noZnOSpcjYY&list=PLg7s6cbtAD15G8lNyoaYDuKZSKyJrgwB-
  - https://www.atlassian.com/git/tutorials/setting-up-a-repository

If we are all on board let's move on! What am I trying to do here with this repo? It's all about getting used to Git and our workflow, made some mistakes and ask questions to each other and the community!

Our objectives are:

Clone this repo.
Make our new branch from default branch.
Make some changes and commit them.
Push our changes to remote.
Make a Pull Request.
Make a comment for a pull request.
Make changes in our code when our pull request is still active.
Review another's pull request.
Make sure we are up to date with default branch.
Answering reviews and push it back.
Join Waffle Board
Create an Issue from GitHub or Waffle
Create a Branch with the Issue Number
Close the Issue with a Pull Request and Use Closing Keywords
Brace Yourself Chingu! Glorious are Coming!

1. Clone this Repo

Make a new directory on your local device named as 'practice-for-geckos'
Open Git Bash or an other command line. Make a new directory named practice-for-geckos and change directory:

mkdir practice-for-geckos and cd practice-for-geckos

Type into terminal: git clone https://github.com/DarisCalinor/practice-for-geckos.git

It will download this repo to your local disc.

cd practice-for-geckos to change directory.
git status You should see in command line

$ git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

Check for your remote with typing git remote -v You should see:

$ git remote -v
origin  https://github.com/DarisCalinor/practice-for-geckos.git (fetch)
origin  https://github.com/DarisCalinor/practice-for-geckos.git (push)

2. Make Our New Branch from Default Branch

Default branch for this repo is master. So, when we create a branch, we are making it from master.

Note: We will use development branch as default when we are in the coding sprints.

Create a new branch with your nickname. I will be using daris-calinor

git checkout -b daris-calinor

Note: There are other ways to create a branch. You change your branch with git checkout, but when you add an -b flag, you will first create a branch with given name and then checkout to that branch.

Now that we are in our branch, we can make some changes!

3. Make Some Changes and Commit Them!

Create a new html file and name it with your nickname! I will be using daris
touch [your nickname here!].html
Open the file with your favorite text editor. Copy and paste this:

<!DOCTYPE html>
<html>
<head>
  <title>Chingu Voyage-4</title>
</head>
<body>
<div>
  Hello Glorious Geckos!
</div>
</body>
</html>

Save and close the file.
Go to terminal and type git status You will see:

$ git status
On branch daris-calinor
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        daris.html

nothing added to commit but untracked files present (use "git add" to track)

Now we have added new file there but it is untracked. Firstly add it to staging area.

git add daris.html Note: Later you can use git add -A to add all changed files together.

git status to check. Always check you added right files to staging area. Now you will see these lines:

$ git status
On branch daris-calinor
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        new file:   daris.html

Make the commit!

git commit -m "Add daris.html file to repo"

When you type git status again you will see:

$ git status
On branch daris-calinor
nothing to commit, working tree clean

Optional: Further reading on writing commit messages, 7 rules and using VIM Editor!

https://chris.beams.io/posts/git-commit/

https://stackoverflow.com/a/36427485/8965331

It is time for the push, Geckos!

4. Push Our Changes to Remote

To push your commit(s) to repo on GitHub simply type:

git push --set-upstream origin daris-calinor

Note: After this you can only use git push for this branch. It will automatically push your commits to defined origin.

git status to check it again. You'll see:

$ git status
On branch daris-calinor
Your branch is up to date with 'origin/daris-calinor'.

nothing to commit, working tree clean

5. Make a Pull Request

Go to https://github.com/DarisCalinor/practice-for-geckos
Click Pull Request on the repo menu bar (just right to the Code tab).
Click green "New Pull Request" button.
Set base: master and compare: your-branch-name under the Compare Changes heading.
You will see your recent commit, how many commit that you have sent and how many files are changed.
Click "Create Pull Request"
You can change title or commit body or leave it to be.
Create that pull request!

6. Make a Comment for a Pull Request

So far, so good. Before continue with issues on GitHub, there are some matters we're gonna touch on. Such as making comments on PR (from now on PR means Pull Request).

Now I'm going to make a comment for your PR. Embrace it and answer me! 😁

But first, please read these articles:

About Comments
- Commenting on a pull request: https://help.github.com/articles/commenting-on-a-pull-request/
- Creating a permanent link to a code snippet: https://help.github.com/articles/creating-a-permanent-link-to-a-code-snippet/

Go to your Pull Request when notification come.
Reply those comments (just write something it doesn't matter).
Make sure you leave a reaction to comments! 👍👎❤️

7. Make Changes in Your Code When Your Pull Request is still Active.

There are always typos in the code 😃 Don't be shy to comment each other's code and encourage yourself and other geckos to be more GLORIOUS! 😎

Make requested changes in the file on your local.
- Make sure you are in the correct branch! Your branch 😎
Make the commit. Let me remind you:
- git status : Check the working directory for unstaged files.
- git add -A : Add them all to stage. (You might see the term: Staging changes).
- git status : Check your staged files. Is that what you want?
  - Defining the what you want: type git diff and see what has changed?
  - If those are not the changes you want to commit, it is not too late. Think about the git reset
  - If so, make the commit already!
- git commit -m "Your commit message"
- git status again to see if everything is ok.
  - If you want to git log to see all commit. And give it a try on git log --oneline
Push it again.
- git push origin <Your Branch Name Here!>

Hopefully, your Pull Request is now updated. Go and check it on GitHub!

8. Review Another's Pull Request

What is that Pull Request Review? Please read the listed articles below:
- About Pull Request Reviews
  - About pull request reviews: https://help.github.com/articles/about-pull-request-reviews/
  - Reviewing proposed changes in a pull request: https://help.github.com/articles/reviewing-proposed-changes-in-a-pull-request/
  - Viewing a pull request review: https://help.github.com/articles/viewing-a-pull-request-review/
So, you know what is reviewing a PR. I have asked to review each other's PRs now.
Please go and check it, and;
- Write some comments here and there.
- Request PR's owner to add a div element to his/her HTML file.
  - Don't ask so much, just a div. You decide what to write!
Complete Review with requesting change and submit it.

9. Make Sure We are up-to-date with Default Branch

Now, we have something to update. But before we will do more changes, it is a good idea that checking that is our default branch up-to-date. We want to do this because we want to minimize the merge conflicts.

So, you may say nothing change with our default branch (master in this case) but you are wrong. While I wrote this README.md, I'm pushing commits to master and overwrite it. So, your README.md file on your local and my README.md file (as long as you read these lines) are different. Go and check it, you can't find these lines in README.md on your local.

Note: Shalini you won't see any changes in README.md file. Because when you will git pull, you will have the latest master branch on remote. But that's OK, anyway you do these steps, too.

Let's make our local master is up-to-date.

First, terminal on your local, check out to master branch.
- git checkout master
Second make a pull from remote repository.
- git pull origin master
- Go and check README.md file again. If eveything went OK, you will see the updated file.
Now go back to your branch (In my case it is daris-calinor)
- git checkout <Your Branch Name>
  - Note-1: If you forget your branch name type git branch It will list all your local branches.
  - Note-2: If you want to see all branches (local + remote) type git branch -va
  - Note-3: When using terminal, write two or three letter of the command/branch name/file name etc. and press TAB key to auto-complete.
When you are in your branch check the logs:
- git log
  - Note: When you merge with git merge there is a commit added to your log. (yes there are other ways for merging strategies, like git rebase but we will use this one.)
So what we did:
- Go to default branch
- Pull it from remote
- Go to our branch
- Merge with default branch
- Now we are up-to-date and ready to work on
This will be our one of the main things we will do regularly in our code sprints.

10. Answering Reviews and Push it Back

Now, all you need to do is make those changes and push it again.
You know all the process.
After you have updated your pull request please Request a Pull Request Review from the team member who wanted the changes.
When you have requested for PR Review of another team-mate, go and review it. If everything is like commented, submit a Approved Review.
I will merge the Approved Reviews with the master.

11. Join Waffle Board

We will be using Waffle to track our issues.
Please sign-up to Waffle.
Join to Waffle board to click with this link: https://waffle.io/DarisCalinor/practice-for-geckos/join
When joined, go and check the Columns. We have these columns and they do these:
- Inbox: Every issue or pull request (unless they have the specific label) goes here.
- Backlog: When we plan what will be doing for that particular issue we carry the Card to this column.
- Next: The issues will be working on upcoming sprints. When we are gonna work on this on next week, we move the card here.
- In Progress: When we start to work on the issue, we move the card here. This represents the issues we are working on it now.
- Review: When your work is done and ready to merge the default branch, we move the card here. This is the step when we create the Pull Request.
- Done: If your Pull Request is approved and merged with default branch, the card goes here. Issue is closed.
You will see your pull requests are in the Review column. You can see review result, requested reviews and comments top-right corner of cards.

12. Create an Issue from GitHub or Waffle

You can either create a issue from GitHub or Waffle.
Please read this from Voyage-Wiki: https://github.com/Chingu-cohorts/voyage-wiki/wiki/Sprints-Issue-Tracking

Create an Issue from GitHub of Waffle

Please read this from GitHub Help: https://help.github.com/articles/creating-an-issue/
Click New Issue in Issues tab under the repo.
Type 'Test for Waffle' to Title and 'This is the test for the waffle!' to description.
Assing Type, Priorty and Scope labels from the menu on right side.
- Type: Feature Priorty: High Scope:Story
- Note: Leave the State labels. Those should be assigned from Waffle.
Click Submit New Issue.
Go to Waffle to check. See our fresh new issue in Inbox! Note: You can add issues from Waffle, too. Just click the blue 'New Issue' button on top of the page, under the Board View tab.

13. Create a Branch with the Issue Number

Most of the time we are handling issues with writing code. In this scenerio our first move should be create a new branch for the specific issue.
Go to your local, and open the terminal. Checkout to default branch (Ours is master for this repo. It will be development for team repo.)
Hit git pull to make sure you are up-to-date.
Create a new branch and checkout to that branch.
- Now, we need to be on the same page for our branch names. We are going to use this convention:
- <type>-<branchName>-#<issue number>
It will be feature-testForWaffle-#6 for this example.
- Use hyphen between Type-brancName-#IssueNo
- Use camel case for writing branch name. https://en.wikipedia.org/wiki/Camel_case
- Be consistent to use this format.
- git checkout -b feature-testForWaffle-#6
Push it to remote!
- git push -u origin feature-testForWaffle-#6
When we push this branch to remote, Waffle will automatically understand that you are working something with related to Issue #6. It will assing you for the issue, move the card to In Progress column on Waffle and assign/change State label on GitHub. The important part here is the write correct number for the issue.
Go and check Waffle and GitHub Issues.
If things won't go as you wish, reach out to me or to the community!

14. Close the Issue with a Pull Request and Use Closing Keywords

We work on the feature in our working branch and make our lots of atomic commits.
- Wait what is Atomic Commit?? Go and check this one: https://www.freshconsulting.com/atomic-commits/
Let's make a tiny change. Create a new file named as <your name>.css. For me it will be daris.css.
Make the commit and push it to origin.
Go to GitHub and make the Pull Request with your working branch.
- Add Closing Keywords to Description for closing the related issue automatically. It's easy and great way to close issue. You can use these keywords in commit title/descriptions or Pull Request title/descriptions.
- For this example I add to PR description Closes #6
When you submit your Pull Request, Waffle identifies the action and moves the related issue card from In Progress to Review column automatically. Go check for Waffle.
When your pull request will be approved and merged with the default branch, Waffle will move the card to Done column.

15. Brace Yourself Chingu! Glorious are Coming!

We are done to get ready, Glorious! Let's get our feet wet!

Brace yourself, Chingu... Glorious are coming!

Name		Name	Last commit message	Last commit date
Latest commit History 21 Commits
README.md		README.md
daris.css		daris.css
daris.html		daris.html
hiral.html		hiral.html
rajpra.html		rajpra.html
sdc.html		sdc.html
test.txt		test.txt

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Repository files navigation

Welcome Glorious Geckos!

Our objectives are:

1. Clone this Repo

2. Make Our New Branch from Default Branch

3. Make Some Changes and Commit Them!

Optional: Further reading on writing commit messages, 7 rules and using VIM Editor!

4. Push Our Changes to Remote

5. Make a Pull Request

6. Make a Comment for a Pull Request

7. Make Changes in Your Code When Your Pull Request is still Active.

8. Review Another's Pull Request

9. Make Sure We are up-to-date with Default Branch

10. Answering Reviews and Push it Back

11. Join Waffle Board

12. Create an Issue from GitHub or Waffle

Create an Issue from GitHub of Waffle

13. Create a Branch with the Issue Number

14. Close the Issue with a Pull Request and Use Closing Keywords

15. Brace Yourself Chingu! Glorious are Coming!

About

Releases

Packages

Contributors 5

Languages

devjohnt/practice-for-geckos

Folders and files

Latest commit

History

Repository files navigation

Welcome Glorious Geckos!

Our objectives are:

1. Clone this Repo

2. Make Our New Branch from Default Branch

3. Make Some Changes and Commit Them!

Optional: Further reading on writing commit messages, 7 rules and using VIM Editor!

4. Push Our Changes to Remote

5. Make a Pull Request

6. Make a Comment for a Pull Request

7. Make Changes in Your Code When Your Pull Request is still Active.

8. Review Another's Pull Request

9. Make Sure We are up-to-date with Default Branch

10. Answering Reviews and Push it Back

11. Join Waffle Board

12. Create an Issue from GitHub or Waffle

Create an Issue from GitHub of Waffle

13. Create a Branch with the Issue Number

14. Close the Issue with a Pull Request and Use Closing Keywords

15. Brace Yourself Chingu! Glorious are Coming!

About

Resources

Stars

Watchers

Forks

Releases

Packages 0

Contributors 5

Languages

Packages