Git Repository Setup

Owned by Yogendra Pandey (Unlicensed)
Last updated: Jul 08, 2020 by Shreya B (Unlicensed)
2 min read

sudo apt-get update

sudo apt-get install nodejs

sudo apt-get install npm

apt install yarn

npm install --global lerna

npm run go (frontend/web/rainmaker - path)

 

  1. Open the egovernments/frontend repository in Github

  1. Create a folder in your system and switch to the folder

  2. Open git bash terminal and clone the repository

3. Switch to frontend folder and fetch all the branches

4. Check the list of branches

5. Switch to the main branch (For example “release-Jan_6”) 

6. Take pull

7. Create new branch to start development 

 

branch-name naming convention:

  1. If it is a defect for example RAIN-115

git checkout -b RAIN-115

  1. If it is feature for example PT mutation

git checkout -b pt-mutation

Code commit steps:

  1. Sync your current branch with feature branch by below command

Git merge origin/release-Jan_6

In case of conflict:

  1. Resolve it manually

  2. Run the command “git merge --continue”

  1. Check the changes in changed files by below command

git status

  1. Add the files you want to commit by below command or add it through VS code editor

git add [file path]

  1. Commit the files by below command or commit it through VS code editor

git commit -m “[commit message]”

  1. Push the commit into repository by below command or through VS code editor

git push origin

  1. While push operation it may ask to add tracking information for newly created working branch. Then set the upstream for the current branch