Am 10.09.2016 um 14:47 schrieb William F Pokorny:

>>> Original github checks clean, but fail after manually bumping up the
>>> version numbers in the branch. Unsure why.
>>
>> It conflicts with changes made to the master branch after you branched
>> off (the version numbers, evidently).
>>
>> I must confess that version number handling is something that seriously
>> bothers me, with a good solution still waiting to be found.

FYI, I've just ditched the running version number from the master
branch, as it turns out to really come crashing down with any reasonable
number of open pull requests around. Once you strip any trailing numbers
after the "alpha" from your pending pull requests, things should run a
good deal more smoothly from now on. (The pre-commit hook should be fine
with this new mode of operation, though it becomes less relevant anyway.)

I've instead added an advice to README.md to not build from the master
branch, but from tagged version only. Tagged versions will continue to
have trailing numbers after the "alpha" so that they can be uniquely
identified for the sake of providing support, but they will be managed
in a dedicated branch, to be updated from time to time from the master
branch.

Post a reply to this message