Git Walk through Examples

1. Create Repository logging into git
2. Add the required code in locally cloned git

3. Add example code file with function and update the code

4. Create branch and checkout code

5. Update code in branch

6. Create Another directory and update code in another branch

7. Overall two branches and two versions of same file

Merge using GIT GUI to master, resolve the conflicts. Simple walkthrough of GIT code management.

Large Commits

Useful tip - Link

1- git stash

2- git add .

3- git commit -m "your commit message"

Force push - git push -f 

More to do

GIT Project Cycle

Git base project

branch 1 dev

branch 2 test

branch 3 uat

branch 4 prod

Checkin Dev code

Move code to QA Branch

Do a Bug fix in QA

Merge QA to Dev

Move QA code to UAT Branch

Do a Bug fix in UAT

Merge UAT to QA, Dev

Move UAT to Prod

Deploy in Prod

1. //pull the latest changes of current development branch if any

git pull (current development branch)

2. //switch to master branch

git checkout master 

3. //pull all the changes if any

git pull

4. //Now merge development into master    

git merge development

5. //push the master branch

git push origin master

Good Read in same lines - Link

	git clone https://github.com/siva2k16/sivademo
	create 'test.txt' in folder
	git add .
	git commit -m 'update'
	git push
	git checkout -b 'branch1'
	create 'branchtest.txt' in folder
	git add .
	git commit -m 'update'
	git checkout master
	git merge 'branch1'
	git push
	#More Examples - https://gitexercises.fracz.com/cheatsheet
	https://support.acquia.com/hc/en-us/articles/360004334093-Removing-large-files-from-Git-without-losing-history
	git filter-branch --index-filter "git rm --cached --ignore-unmatch ./path/to/resource/*.jpg" --tag-name-filter cat -- --all
	git filter-branch --index-filter "git rm --cached --ignore-unmatch ./path/to/resource/*.pptx" --tag-name-filter cat -- --all
	git filter-branch --index-filter "git rm --cached --ignore-unmatch ./path/to/resource/*.mp4" --tag-name-filter cat -- --all
	git filter-branch --index-filter "git rm --cached --ignore-unmatch ./path/to/resource/*.pb" --tag-name-filter cat -- --all
	git push origin --force --all

view raw git_demo_steps.txt hosted with ❤ by GitHub

	#Install Visual C++ Build Tools on Windows - https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools&rel=16
	#Get all packages in current environment
	pip freeze > requirements.txt
	#Install these in your target environment
	pip install -r requirements.txt

view raw package_Install_commads.txt hosted with ❤ by GitHub

	Suppose your project is called SomeProject library and you need branches qa and dev besides default master. Here's what you do:
	git clone https://github.com/someperson/someproject.git
	cd someproject
	git checkout -b qa origin/qa
	gir checkout -b dev origin/dev
	git checkout qa
	git checkout dev
	#https://levelup.gitconnected.com/use-git-like-a-senior-engineer-ef6d741c898e
	git log gives you some information
	git show <commit> --stat (View the summary of a commit)
	git show <commit> -- <filepath> (View specific file changes for a commit)
	git merge vs git rebase
	#merge takes the changes from one branch and merges them into another branch in one merge commit.
	git merge origin/main your-branch
	#rebase adjusts the point at which a branch actually branched off (i.e. moves the branch to a new starting point from the base branch).
	git rebase origin/main your-branch

view raw gitexamples.txt hosted with ❤ by GitHub

Happy Learning!!!