Git Merge Without Auto Merge