How to amend the last commit in Git ?

Have you ever faced a situation where you left something out of your last commit ? It may be a file or an extra change to a file you just committed. Such kind of scenarios can easily be handled with Git amend command .

How to resolve merge conflicts after git rebase

Have you faced a merge conflict while performing git rebase operation ? This is quite possible if two commits modify the same line in the same file. Now git is confused which change to apply.