# Upgrading Mender Server from 2.0 to 2.1

**URL:** <https://hub.mender.io/t/upgrading-mender-server-from-2-0-to-2-1/1103>\
**Category:** General Discussions\
**Created:** [October 4, 2019, 1:34pm UTC](https://hub.mender.io/t/upgrading-mender-server-from-2-0-to-2-1/1103 "2019-10-04T13:34:02Z")\
**Posts on this page:** 1\
**Showing post:** 6

<div class="post-metadata">

**Author:** ![drewmoseley](https://yyz2.discourse-cdn.com/flex036/user_avatar/hub.mender.io/drewmoseley/32/47_2.png) [@drewmoseley](https://hub.mender.io/u/drewmoseley)\
**Post date:** [October 8, 2019, 4:46pm UTC](https://hub.mender.io/t/upgrading-mender-server-from-2-0-to-2-1/1103/6 "2019-10-08T16:46:44Z")

</div>

Given the conflicts posted above, I think using the “git merge 2.1.0 --strategy-option theirs” command is the best approach.

---

_[View the full topic](https://hub.mender.io/t/upgrading-mender-server-from-2-0-to-2-1/1103)._