Working with Git branches Flashcards
1
Q
What’s the procedure of merging solution branch to main branch?
A
git checkout main
git merge solution
2
Q
What’s “fast forward” merge?
A
A merge that happens when target branch doesn’t contain any new commits at the point in time when you want to merge from solution.
3
Q
How to compare 2 branches?
A
git diff branch1 branch2
4
Q
How to see current changes that haven’t been staged yet?
A
git diff
5
Q
How to see just current changes that have been staged?
A
git diff –cached
6
Q
How to see staged and unstaged current changes?
A
git diff HEAD
7
Q
How to commit all changes using one line command?
A
git commit -am “message”
8
Q
How to ignore whitespace changes when doing diff?
A
git diff -w
9
Q
How to show the original content of a file when doing diff?
A
git show <hash></hash>
10
Q
A
