Skip to content

Commit

Permalink
Changes to Desktop Tutorial 03
Browse files Browse the repository at this point in the history
I have added few more assets and then updated the desktop-tutorial.md.
  • Loading branch information
cheriannet committed May 12, 2018
1 parent 658d8f9 commit 2802403
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 7 deletions.
Binary file added assets/dt1-confirm-pull.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/dt1-create-pull-request.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/dt1-merge-pull.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/dt1-new-pull.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/dt1-update-original.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 26 additions & 7 deletions github-desktop-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,21 +97,40 @@ Now submit the pull request.

<img style="left;" src="assets/submit-pull.png" alt="submit pull request" />

## Keeping your fork synced with this repository
You have now sucessfully completeed your first github source code update. Please give yourself a pat in the back. :)

## Keeping your fork synced with this repository (Optional)

Now I'll be merging all your changes into the master branch of this project. Your fork won't have those changes.

In order to keep your fork synced with mine, click `Sync` on the top right.
In order to keep your fork synced with mine, go to github.com and go to your fork.

You'll see that your fork is several commits behind of Roshanjossey:master.

Now click on "New pull request" on your fork.

IMPORTANT: YOU HAVE TO DO THIS ON YOUR FORK, NOT ON THE ORIGINAL FORK.

<img style="left;" src="assets/dt1-new-pull.png" alt="new pull request" />

When you are there, make sure Roshan's fork is on the right and your fork on the left. If not change it manually. And then click `Create Pull Request`

<img style="left;" src="assets/dt1-create-pull-request.png" alt="sync" />

Type the title "Update Original" for your pull and click on `Create pull request`

<img style="left;" src="assets/dt1-update-original.png" alt="sync" />


<img style="left;" src="assets/dt-sync.png" alt="sync" />
Scroll down and click on `Merge pull request`

When there are new commits to sync, click `Update from Roshanjossey/master`
<img style="left;" src="assets/dt1-merge-pull.png" alt="sync" />

<img style="left;" src="assets/dt-sync2.png" alt="sync" />
Click on `Confirm Merge`

Hovering over `Update from Roshanjossey/master` will show you that you are up to date:
<img style="left;" src="assets/dt1-confirm-pull.png" alt="sync" />

<img style="left;" src="assets/dt-sync3.png" alt="sync" />
You have now synced with Roshan's fork.

## Tutorials Using Other Tools

Expand Down

0 comments on commit 2802403

Please sign in to comment.