#git-merge - Hossein Margani's Blog