You have just completed rebasing your master branch and need to manually update the remote master, even though there is a merge conflict. How can you accomplish this?

What is the difference between git fetch and git pull

What command displays the difference between the working tree and the stage/index area, as well as files not tracked by Git?

Your current repository has three branches: master, beta, and push-notifications. You have just finished the notification feature and commit the changes to the push-notification branch, and you want to include them in the beta branch. How can you accomplish this?

You would like to restore some previously stashed work to a new branch. How can you do that?

What is the difference between git branch -d and git branch -D?

How can I get the commit ID?

How do you undo all changes since your last commit?

Which command will restore the current branch and working copy to the exact state it was at before the most recent commit?

What feature really makes GIT stand apart from nearly every other SCM

You want to revert 'notes.txt' to the version in the most recent commit.