What is the difference between Git merge and rebase Read more about What is the difference between Git merge and rebase
How can you enter a merge in the conflicted stage? Read more about How can you enter a merge in the conflicted stage?
How do you create an additional commit or amend it in case of broken commits? Read more about How do you create an additional commit or amend it in case of broken commits?
How do you revert a commit that has already been pushed and made public? Read more about How do you revert a commit that has already been pushed and made public?