Skip to content

Update 06-branching.md #17

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update 06-branching.md #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fd1b3a
Update 06-branching.md
SultanOrazbayev Jan 3, 2021
0475192
Update 07-merging.md
SultanOrazbayev Jan 3, 2021
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
14 changes: 11 additions & 3 deletions git/06-branching.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,17 @@ git branch -d <branchname>

1. `cd` into the assignments repository (`~/Development/assignments`).

2. List the branches currently in the repository. It should just be `master` with an asterisk next to it showing that is the current active branch.
2. Clone the following repository: `[email protected]:code4policy/2021-hw5-hellopy.git`.

```shell
git clone [email protected]:code4policy/hellopy.git
```


3. Open folder `hellopy`. List the branches currently in the repository. It should just be `main` with an asterisk next to it showing that is the current active branch.

```
cd hellopy
git branch
```

Expand Down Expand Up @@ -133,7 +141,7 @@ git branch -d <branchname>

13. Go to github.com and see the branch appear in the dropdown window. Click on it and then view the list of commits within this branch.

14. Go to the pull requests tab and create a new pull request. Leave `base` as `master` and set the `compare` branch to your new `add-comments` branch. Give it a title and a description and create the pull request.
14. Go to the pull requests tab and create a new pull request. Leave `base` as `main` and set the `compare` branch to your new `add-comments` branch. Give it a title and a description and create the pull request.

![](https://i.imgur.com/XNmv1lk.png)

Expand All @@ -156,7 +164,7 @@ Example PRs:

## ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Try It

1. In `<name>-simple-website/` create a new branch called `linkedin-link`
1. In `5-simple-website-<name>/` create a new branch called `linkedin-link`

2. In this new branch, put a link to your LinkedIn profile at the bottom of your simple website.

Expand Down
4 changes: 2 additions & 2 deletions git/07-merging.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

## ![#c5f015](https://placehold.it/15/c5f015/000000?text=+) Example

1. `cd` into the `<yourname>-simple-website/` folder and open the directory in sublime as well.
1. `cd` into the `5-simple-website-<yourname>/` folder and open the directory in sublime as well.

```
cd ~/Development/<yourname>-simple-website
cd ~/Development/5-simple-website-<yourname>
subl .
```

Expand Down