Skip to content

more updates #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndanielsen merged 1 commit into from
Jun 5, 2019
Merged

more updates #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions materials/4-Git-Advanced.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

# Advanced
# Git Advanced

Let's dive into some more advanced topics on using git.

## Git Branches

A branch represents a different line or work that is separated from the `main` or `master` branch. It is a helpful mechanism for allowing multiple people to work on the same git repository (and github project) in potentially overlapping locations without stepping on too many toes.

In git, we use branches to work in parallel and then merge our code together.



Check out your current branch for your `ice-cream-shop` project.

```
Expand Down Expand Up @@ -48,6 +48,7 @@ hint: `git push <origin> <branch_name>`

#### Protip:
You can create and checkout a branch in one command.

```
$ git checkout -b some-branch`
```
Expand Down Expand Up @@ -81,6 +82,11 @@ Now that we have added some gelato in a separate branch (body of work) of our co

```

### Protip

Install [git-completion](https://github.com/bobthecow/git-flow-completion/wiki/Install-Bash-git-completion) to make using git much easier.


### Resources

Here are a few other resources that might be helpful for diving deeper into git.
Expand Down