Tips for git rebase

[Nguyen Anh Tu]

Hi guys,

Could anyone share some tips or GUI tool for making git rebase easier? I
have to rebase my working branch with master but get many many conflicts
which I have no idea about these pieces of code.

Thanks for any help,

-- 

N.g.U.y.e.N.A.n.H.t.U