Git Merge From Terminal