do we always want this to be a pull? Would it ever be a checkout? Do we always want to be aware of merge conflcts?