GIT Basic Operations with Scenarios - 1 || Clone || Pull || Commit || Push || Conflict || Merge

This video explains the following topics :

Introduction
• Installation
○ GIT Server - Git Hub
○ GIT Client
• Git Operations
○ Clone
○ Pull
○ Push
○ Branch
○ Merge
○ Conflict


• Org
○ Url
○ Username/password
• First time - Get the code - clone
○ git clone https://github.com/bharath411/sst3-api.git
• Modify & update to server
○ new file
○ update existing
○ delete existing
○ put into server
• Somebody else modified - pull
○ git pull
§ get the latest code
§ abc123


Configurations:
git config --global user.email "mailid"
git config --global user.name "name"

----------- Scenario 1
• I will modify an existing file
• I will check what are files are modified
○ git status
• Select a file which modified and add it to the stage
○ git add filename
• I will commit code
○ git commit -m "message"
• Then I will push
○ permissions

---------------------------------

Scenario 2
• Dev - 1 modify the code
• Commit the code
• Dev - 2 Pushed his changes
• Dev - 1 has to push the changes - failed
○ get the latest code - git pull
§ If editor opens, come out of the editor
□ esc , :q
○ push

----------------
Scenario 3
• Dev - 1 modify the code
• Commit the code
• Dev - 2 Pushed his changes
• Dev - 1 has to push the changes -
○ git pull
§ If there is editor opens, close using - :q
§ CONFLICT (content): Merge conflict
□ Abort the merge
® git merge --abort
□ Fix the conflict
® Open the conflicted file
® Decide which code has to be there in the file
® Remove all unnecessary lines of code
® git add filename
® git commit -m "message"
® git pull
® git push

----------------
Scenario 4
• Dev - 1 modify the code
• He don't need the code
○ permanently and replace the code with remote file
§ git checkout filename
○ stash
§ git stash
§ git stash show
§ git stash apply
Scenario 5
• Dev - 1 modify the code
• Dev - 2 Pushed his changes
• Dev - 1 pull latest changes
○ Commit the code
○ Stash the code