basic steps git repository + node app

Git ignore details

https://elanderson.net/2016/09/add-git-ignore-to-existing-visual-studio-project/

Clone the repo from git

C:\Users\Pahuja Saurabh\saurabh\projects\SonyPictures\DriverBasedModel\DriverBasedModel\DriverBasedModel.API>git clone http://appstfs.sample.com/tfs/AppsSAMPLE/_git/DriverBasedModel

Navigate to folder where packages.json is present

C:\Users\Pahuja Saurabh\saurabh\sample projects\SonyPictures\DriverBasedModel\DriverBasedModel\DriverBasedModel.API>cd C:\Users\Pahuja Saurabh\saurabh\sample projects\SonyPictures\DriverBasedModel\DriverBasedModel\DriverBasedModel.API

Installing all the node packages as defined in package.json

C:\Users\Pahuja Saurabh\saurabh\sample projects\SonyPictures\DriverBasedModel\DriverBasedModel\DriverBasedModel.API>npm install

starting node server

C:\Users\Pahuja Saurabh\saurabh\sample projects\SonyPictures\DriverBasedModel\DriverBasedModel\DriverBasedModel.API>npm start

eg of installing a module (here passport)

C:\Users\Pahuja Saurabh\saurabh\sample projects\SonyPictures\DriverBasedModel\DriverBasedModel\DriverBasedModel.API>npm install passport –save

checking if node has started:

C:\Users\Pahuja Saurabh\saurabh\sample projects\SonyPictures\DriverBasedModel\DriverBasedModel\DriverBasedModel.API>node

> 2+2

4

>  

Sample chkin procedure

Move to the project root location where .git is placed

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ cd "C:\Users\Pahuja Saurabh\saurabh\sample projects\SonyPictures\DriverBasedMode

l"

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git status

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git branch

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git stash –u

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git stash pop

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git stash –u

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git checkout -b sql

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git branch

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git stash pop

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git status

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git add .

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git status

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git commit -m "sql interaction"

Pahuja Saurabh@IKA-PAHUJSAU1 MINGW64 ~/saurabh/sample projects/SonyPictures/DriverBasedModel (sql)$ git push origin sql

Sql is the branch name

Creating a branch and merging back

• take latest pull from master:  git pull
• create new branch : git checkout –b {branchname}      {-b is creating the branch, if already created –b is not needed}
• do your work in this branch, commit in this branch itself
• on merging back:
• git checkout master
• git pull
• git checkput {branchname}
• git rebase master   à if conflicts are there, they would be shown. resolve/merge the conflicts
• once resolved, git add .
• git rebase –continue
• git push origin {branchname}
• now create a pull request from master to merge {branchname} into it

merging a branch to master

• git checkout codeAlt
• git status
• git add .
• git commit -m "sampleMsg"
• git checkout master
• git pull
• git checkout codeAlt
• git rebase master
• git push origin codeAlt
• git push -f origin codeAlt   à force push, use only if above line gives you error

deleting the branch

• git checkout master
• git pull
• git branch
• git branch -D codeAlt