# Heads up regarding ID Dashboard upstream git divergence from your fork branches

**URL:** <https://talk.openmrs.org/t/heads-up-regarding-id-dashboard-upstream-git-divergence-from-your-fork-branches/1647>\
**Category:** ID Dashboard\
**Tags:** git\
**Created:** [April 10, 2015, 8:59am UTC](https://talk.openmrs.org/t/heads-up-regarding-id-dashboard-upstream-git-divergence-from-your-fork-branches/1647 "2015-04-10T08:59:03Z")\
**Posts on this page:** 1\
**Page:** 1

<div class="post-metadata">

**Author:** ![r0bby](https://talk.openmrs.org/user_avatar/talk.openmrs.org/r0bby/32/6479_2.png) [@r0bby](https://talk.openmrs.org/u/r0bby)\
**Post date:** [April 10, 2015, 8:59am UTC](https://talk.openmrs.org/t/heads-up-regarding-id-dashboard-upstream-git-divergence-from-your-fork-branches/1647/1 "2015-04-10T08:59:03Z")

</div>

Due to me trying to tidy up my commits – I learned a hard lesson to not rewrite commit history…if you have any local changes, set them aside and just reclone upstream and then force-push to your local fork. It’s the easiest and cleanest way to resolve this. Your branches have very likely diverged.

I promise to not make any more messes but wanted to give a heads up.

My apologies for having to publicly uhm, post this.