Use LEFT and RIGHT arrow keys to navigate between flashcards;
Use UP and DOWN arrow keys to flip the card;
H to show hint;
A reads text to speech;
3 Cards in this Set
- Front
- Back
|
What is use of merging ? |
Suppose you are working on project, and you need to fix an issue. Then, create a new branch, implement bug fix, and commit. Then checkout main branch, merge the branch created. Delete branch created for bug fix. If merge conflict arises, you need to fix conflicts and commit them. |
|
|
What is git re-basing ? |
It is alternative to merge, it just takes a snapshot and replays on some branch. It can take more than one snapshot. Finally it results into linear progress and cleaner git logs. Then you can merge. |
|
|
How to Revert changes and commits ? |
Use git revert HEAD~2..HEAD (last two) OR Just checkout a previous commit and commit it anew. |
