git clone https://github.com/intive/patronage21-qa.git

cd patronage21-qa

git checkout master

git checkout -b feature/feature-name

git branch -u origin/master

Display the state of the working directory and the staging area

git status

Stage specific file

git add path_to_file/filename.extension

OR

Stage all files (new, modified, deleted)

git add -A

git commit -m "feature Commit message"

git pull --rebase (No conflicts)

Case 1 - Already up to date

Case 2 - Downloading changes without conflicts

git pull --rebase (Conflicts)

Resolve conflicts in text editor

Before

After

OR

Resolve conflicts in VisualStudio

git add path_to_file/filename.extension

git rebase --continue

git rebase -i

Commits before editing

Squash commits

Commit message before editing

Changed commit message

git push origin HEAD

WARNING: If you have to use --force
use: git push origin HEAD --force-with-lease

Create a pull request in accordance with the guidelines on: Branching policy

Select the appropriate base branch

When your pull request is approved by the appropriate number of people, do the merge according to the guidelines on: Branching policy

Remote branch

OR

Local branch

git checkout master

git pull --rebase

git branch -D feature/feature-name