Added option to specify a version without inferring it from tags
Changed squash behaviour to checkout every conflict from the topic branch