Git and GitHub

Elder INTERalliance

=====

Git vs GitHub

====

Git

A version control software
Allows multiple people to work on the same project simultaneously
Kind of like Google Docs for code

====

GitHub

A web interface for Git
A place to host Git projects
Adds some additional features on top of Git

=====

Why should I care?

Makes code collaboration easy
Makes managing code conflicts easy

====

GitHub Stats

56+ million Developers

3+ million Organizations

100+ million Repositories

72% Fortune 50

=====

A quick intro

====

=====

Let's Review

====

What is GitHub?

Moisture data sharing. 💧
A tool for farmers. 👩‍🌾
Tractor cloning software. 🐑🐑
A collaborative platform for building software. 🔨

====

What is Git?

Version control software. 🎮
A search engine. 🔍
A social network for farmers. 🕸
A programming language. 🐱‍💻

=====

Join GitHub

github.com/join

====

Join Github

=====

Create your first repository!

New Repo

====

Fill out the detials

Make sure to check the box to Add a README file Repo Details

=====

Commits

A reference to a point in history
Similar to saving a file

=====

Let's make a new commit!

==== Click the pencil icon to the right of README.md Project Page

==== It should now look like this: Editing README

==== Change your second line Change README

==== Scroll to the bottom of the page and give your commit a message First Commit

==== Click commit First Commit

=====

Congrats, that's your first commit! 🎉

====

You should now see your name in your README Completed Commit

=====

Let's Review

====

What is a commit?

A promise. 🔗
A reference to a point in history. 👆
A request to combine branches of code. 👩‍💻
A shooting star. 🌟

=====

On to the next project!

=====

Forks 🍴

A personal copy of another user's repository
Allows you to directly edit
Not part of Git, but instead GitHub

=====

Slack Bio Bot

git.io/Jqedr

====

It should look like this:

Bio Bot

=====

Create a fork

Look in the top right corner. Bio Bot

====

It should look like this:

Note your username now shows up in the top left Bio Bot Fork

=====

You will be adding your bio to the Slack Bio Bot Example Bio

====

You can customize this template:

link.kevinuulong.com/JwZnt

====

Once you are signed in you should see something like this:

Slack Block Kit Builder

====

You can edit the text in the `Payload` panel on the right

Slack Block Kit Builder

====

Customize with your own information

 {
    "blocks": [
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "About You"
            },
            "accessory": {
                "type": "image",
                "image_url": "Image URL",
                "alt_text": "Image Description"
            }
        },
        {
            "type": "divider"
        },
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "*Some of his interests include:*"
            }
        },
        {
            "type": "section",
            "fields": [
                {
                    "type": "mrkdwn",
                    "text": ":swimmer: Swimming"
                }
            ]
        },
        {
            "type": "divider"
        },
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "Check out his personal profiles:"
            }
        },
        {
            "type": "actions",
            "elements": [
                {
                    "type": "button",
                    "text": {
                        "type": "plain_text",
                        "text": ":github: GitHub",
                        "emoji": true
                    },
                    "url": "https://github.com/kevinuulong",
                    "action_id": "actionId-00"
                }
            ]
        }
    ]
} {
    "blocks": [
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "About You"
            },
            "accessory": {
                "type": "image",
                "image_url": "Image URL",
                "alt_text": "Image Description"
            }
        },
        {
            "type": "divider"
        },
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "*Some of his interests include:*"
            }
        },
        {
            "type": "section",
            "fields": [
                {
                    "type": "mrkdwn",
                    "text": ":swimmer: Swimming"
                }
            ]
        },
        {
            "type": "divider"
        },
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "Check out his personal profiles:"
            }
        },
        {
            "type": "actions",
            "elements": [
                {
                    "type": "button",
                    "text": {
                        "type": "plain_text",
                        "text": ":github: GitHub",
                        "emoji": true
                    },
                    "url": "https://github.com/kevinuulong",
                    "action_id": "actionId-00"
                }
            ]
        }
    ]
} {
    "blocks": [
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "About You"
            },
            "accessory": {
                "type": "image",
                "image_url": "Image URL",
                "alt_text": "Image Description"
            }
        },
        {
            "type": "divider"
        },
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "*Some of his interests include:*"
            }
        },
        {
            "type": "section",
            "fields": [
                {
                    "type": "mrkdwn",
                    "text": ":swimmer: Swimming"
                }
            ]
        },
        {
            "type": "divider"
        },
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "Check out his personal profiles:"
            }
        },
        {
            "type": "actions",
            "elements": [
                {
                    "type": "button",
                    "text": {
                        "type": "plain_text",
                        "text": ":github: GitHub",
                        "emoji": true
                    },
                    "url": "https://github.com/kevinuulong",
                    "action_id": "actionId-00"
                }
            ]
        }
    ]
} {
    "blocks": [
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "About You"
            },
            "accessory": {
                "type": "image",
                "image_url": "Image URL",
                "alt_text": "Image Description"
            }
        },
        {
            "type": "divider"
        },
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "*Some of his interests include:*"
            }
        },
        {
            "type": "section",
            "fields": [
                {
                    "type": "mrkdwn",
                    "text": ":swimmer: Swimming"
                }
            ]
        },
        {
            "type": "divider"
        },
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "Check out his personal profiles:"
            }
        },
        {
            "type": "actions",
            "elements": [
                {
                    "type": "button",
                    "text": {
                        "type": "plain_text",
                        "text": ":github: GitHub",
                        "emoji": true
                    },
                    "url": "https://github.com/kevinuulong",
                    "action_id": "actionId-00"
                }
            ]
        }
    ]
} {
    "blocks": [
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "About You"
            },
            "accessory": {
                "type": "image",
                "image_url": "Image URL",
                "alt_text": "Image Description"
            }
        },
        {
            "type": "divider"
        },
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "*Some of his interests include:*"
            }
        },
        {
            "type": "section",
            "fields": [
                {
                    "type": "mrkdwn",
                    "text": ":swimmer: Swimming"
                }
            ]
        },
        {
            "type": "divider"
        },
        {
            "type": "section",
            "text": {
                "type": "mrkdwn",
                "text": "Check out his personal profiles:"
            }
        },
        {
            "type": "actions",
            "elements": [
                {
                    "type": "button",
                    "text": {
                        "type": "plain_text",
                        "text": ":github: GitHub",
                        "emoji": true
                    },
                    "url": "https://github.com/kevinuulong",
                    "action_id": "actionId-00"
                }
            ]
        }
    ]
}

====

Once you have filled it out click Copy Payload from the top ✂️

=====

Back to GitHub 🔙

====

Click on the `bios` directory

Back at GitHub

====

Create a new file

Add file > Create new file

====

Name your file

Use your name without spaces

⚠️ Make sure that it ends in .json Name your File

====

Paste your bio 📋

If it isn't on your clipboard go back and copy it from Slack again Paste your Payload

====

Scroll down and commit

🔔 Don't forget a commit message! Commit your Changes

====

You should now see your new commit

After Commit

=====

Some new terms!

====

Merging

Applies changes from one branch or fork into another
Combines the commit history from the two into one

====

Pull Request

A request to merge two branches or forks
Allows others to review your changes before going live

=====

Back to GitHub 🔙

====

Creating a Pull Request

Click on Pull Request (on the right) Create a Pull Request

====

Click on Create pull request

This screen allows you to choose the branches and repositories to merge Create a Pull Request

====

Provide a Title and Description

The description should tell a reviewer anything they would need to know about your proposed changes Describe Pull Request

====

Scroll down and Click Create pull request

📝You can also see the changes you are proposing Create Pull Request

=====

Congrats, that's your first pull request! 🥳

====

Your pull request is now open for review!

Pull Request Open for Review

====

If your pull request passes review it can then be merged

📝In this example this happens automatically; however, usually a mainainer will have to manually merge it Merged Pull Request

=====

Let's Review

====

What is a fork?

A request to combine two branches. 🌿
An utensil. 🍴
A personal copy of a repository. ✂️
A combination of commit history. 🧔

====

What is merging?

Combining changes from two separate branches into one. 1️⃣
A method of organizing your code. 🧹
What cars do when getting on the highway. 🚗
None of the above. ❌

====

What is a pull request?

A request for a copy of the code. 👩‍💻
A request to combine two branches. 🌿
A reference to a point in history. 👆
A request to poll contributers. ✅

=====

Time to Test!

====

Open Slack

Try typing /bio Your Name Slack Command

====

Did it work?

If not, have someone else take a look at your commit.

Bio in Slack

=====

That's the Git and GitHub basics!

=====

Extra Time? ⌚

Try a challenge!

====

Try opening an issue to ask for your pet to be added. (Make sure to include any details needed, bio, picture, etc.) 🐕
If you see an open issue, try resolving it! 🛠️
Check out learngitbranching.js.org to learn how to use Git from the Command Line 🐱‍💻

 public function foo()
{
    $foo = array(
        'bar' => 'bar'
    )
} public function foo()
{
    $foo = array(
        'bar' => 'bar'
    )
}

Git and GitHub Elder INTERalliance ===== Git vs GitHub ==== Git A version control software Allows multiple people to work on the same project simultaneously Kind of like Google Docs for code ==== GitHub A web interface for Git A place to host Git projects Adds some additional features on top of Git ===== Why should I care? Makes code collaboration easy Makes managing code conflicts easy ==== GitHub Stats 56+ million Developers 3+ million Organizations 100+ million Repositories 72% Fortune 50 ===== A quick intro ==== ===== Let's Review ==== What is GitHub? Moisture data sharing. 💧 A tool for farmers. 👩‍🌾 Tractor cloning software. 🐑🐑 A collaborative platform for building software. 🔨 ==== What is Git? Version control software. 🎮 A search engine. 🔍 A social network for farmers. 🕸 A programming language. 🐱‍💻 ===== Join GitHub github.com/join ==== ===== Create your first repository! ==== Fill out the detials Make sure to check the box to Add a README file ===== Commits A reference to a point in history Similar to saving a file ===== Let's make a new commit! ==== Click the pencil icon to the right of README.md ==== It should now look like this: ==== Change your second line ==== Scroll to the bottom of the page and give your commit a message ==== Click commit ===== Congrats, that's your first commit! 🎉 ==== You should now see your name in your README

	{
	"blocks": [
	{
	"type": "section",
	"text": {
	"type": "mrkdwn",
	"text": "About You"
	},
	"accessory": {
	"type": "image",
	"image_url": "Image URL",
	"alt_text": "Image Description"
	}
	},
	{
	"type": "divider"
	},
	{
	"type": "section",
	"text": {
	"type": "mrkdwn",
	"text": "Some of his interests include:"
	}
	},
	{
	"type": "section",
	"fields": [
	{
	"type": "mrkdwn",
	"text": ":swimmer: Swimming"
	}
	]
	},
	{
	"type": "divider"
	},
	{
	"type": "section",
	"text": {
	"type": "mrkdwn",
	"text": "Check out his personal profiles:"
	}
	},
	{
	"type": "actions",
	"elements": [
	{
	"type": "button",
	"text": {
	"type": "plain_text",
	"text": ":github: GitHub",
	"emoji": true
	},
	"url": "https://github.com/kevinuulong",
	"action_id": "actionId-00"
	}
	]
	}
	]
	}