/javascriptWorkshop

jQuery, jQuery UI, KnockoutJS

Primary LanguageJavaScript

#Atos javascript workshop This javascript workshop is composed by Marco Franssen, Jan Saris and Sander van de Velde.

#Contributors

Install Git

Install Git Extensions. This will provide you a good GUI to Git (easy for Git starters), includes GIT.

#SSH Key for github repo access
In order to connect to your github repository you need a SSH Key, so if you don't have one follow the following instructions.

  1. Generate a ssh key

Navigate to your directory where you did install GitExtensions. (Default: C:\Program Files (x86)\GitExtensions)
Open the folder PuTTY and click the executable puttygen.exe and click the button Generate.

  1. Save private key

Optionally configure a password for your private key and then save the private key to a location on your harddrive. (For example: c:\sshKeys\github.ppk)

  1. Paste public key on your github profile

Optionally save your public key to your harddrive. Then navigate to https://github.com/account/ssh and click add another public key. Copy the public key from puttygen.exe and paste it in the Key input-field and click save. (Title field not required)

#How to fork

  1. Fork the javascriptWorkshop repo

Fork the javascriptWorkshop repo by clicking the Fork button on https://github.com/atosorigin/javascriptWorkshop

  1. Clone the javascriptWorkshop project

Navigate to the folder where you want to add the javascriptWorkshop folder. Right-Click this folder and choose for Git Bash here. Run the following code: (replace username by your own Github username)
$ git clone git@github.com:username/javascriptWorkshop.git

  1. Configure remotes

When a repo is cloned, it has a default remote called origin that points to your fork on GitHub, not the original repo it was forked from. To keep track of the original repo, you need to add another remote named upstream:
$ cd javascriptWorkshop the active directory in the prompt to the newly cloned "javascriptWorkshop" directory
$ git remote add upstream git@github.com:atosorigin/javascriptWorkshop.git Assigns the original repo to a remote called "upstream"
$ git fetch upstream

  1. Pushing

Pushing is always done to your own fork
$ git push origin master

  1. Fetch the upstream with your fork

When you want to get the latest changes fetched from the upstream into your fork, you need to fetch the upstream.
$ git fetch upstream
$ git merge upstream/master

  1. Pull requests

Don't forget to do a pull request when you have added value to the project.