A post was split to a new topic: Git error: “Warning: pulling will start a merge with conflicts” and “Can’t push: unpulled changes must be merged first”