[Discuss OpenCPI] upgrading branch to 1.5

From: Chris Hinkey <chinkey_at_geontech.com>
Date: Wed, 15 May 19 11:33:10 -0400

I am attempting to upgrade a branch that i have been working on locally
that was created off of the 1.4 branch initially. I am attempting to merge
in the 1.5rc4 tag from the staging branch into my branch and I am getting a
bunch of merge conflicts (100s) with files I did not change.

When I inspect the staging branch it seems like there is no common ancestor
before the 1.3.1 release. I would expect the 1.4 release to be in the
staging branch but it is not. will this be in the 1.5_release branch when
it is eventually created? Should I just wait?

-Chris


Received on Wed May 15 2019 - 15:33:10 CDT