Skip to content

Version: advance master to form start point for future work#441

Merged
vadi2 merged 1 commit intoMudlet:masterfrom
SlySven:(master)_initiate_dev
Mar 27, 2017
Merged

Version: advance master to form start point for future work#441
vadi2 merged 1 commit intoMudlet:masterfrom
SlySven:(master)_initiate_dev

Conversation

@SlySven
Copy link
Copy Markdown
Member

@SlySven SlySven commented Mar 26, 2017

It is my understanding that urgent bug fixes for the Release 3.0.0 need to be based on a version with the same version major.minor.patch "Sematic Version" string but, until actually "released" will carry a "-dev" build suffix. This commit will introduce the change so that the resultant point in the repository becomes the start point for such fixes and other work.

Signed-off-by: Stephen Lyons slysven@virginmedia.com

It is my understanding that urgent bug fixes for the Release 3.0.0 need to
be based on a version with the same version major.minor.patch "Sematic
Version" string but, until actually "released" will carry a "-dev" build
suffix. This commit will introduce the change so that the resultant point
in the repository becomes the start point for such fixes and other work.

Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
@SlySven SlySven requested review from keneanung and vadi2 March 26, 2017 21:10
@SlySven
Copy link
Copy Markdown
Member Author

SlySven commented Mar 26, 2017

Have I got this right, now? #441 was wrong but I would like to get a start point set up for the bug fixes we need on top of Release 3.0.0 and until (I think) we can complete the merging of the development branch this will be what those fixes need to work off/start from.

Copy link
Copy Markdown
Member

@vadi2 vadi2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@vadi2
Copy link
Copy Markdown
Member

vadi2 commented Mar 26, 2017 via email

Copy link
Copy Markdown
Member

@keneanung keneanung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@SlySven
Copy link
Copy Markdown
Member Author

SlySven commented Mar 27, 2017

Can you do the merge for this Vadim, I don't want to get carried away... 😜

@vadi2 vadi2 merged commit b5f3264 into Mudlet:master Mar 27, 2017
vadi2 added a commit that referenced this pull request Mar 27, 2017
@vadi2
Copy link
Copy Markdown
Member

vadi2 commented Mar 27, 2017

Okay so right after I pressed merge I realised that this is on master. Isn't the idea that we keep master as latest released and development as latest development?

@vadi2
Copy link
Copy Markdown
Member

vadi2 commented Mar 27, 2017

I wanted to submit a revert PR but decided to hold off until we figured this out. Nonetheless, the github UI already created a revert commit that I can't get to go away.

I've gotten so used to PRs coming into development that I thought this was targetted at that branch as well...

@SlySven
Copy link
Copy Markdown
Member Author

SlySven commented Mar 27, 2017

For changes to be made we need to have a starting point, doesn't this become that starting point?

Otherwise part of any PR would be something that then needed to take the code away from being labelled as if it was the release version - this does that and become the (future) development branch until we can get the existing "development" branch properly merged in. 😕

@vadi2
Copy link
Copy Markdown
Member

vadi2 commented Mar 27, 2017

But we don't work on master, we work on development. As mentioned master is for latest releases only and thus development is our starting point.

master has always been the latest release (which is why it was never updated since 2.1 until now) and it will stay the latest release.

vadi2 added a commit that referenced this pull request Mar 27, 2017
vadi2 added a commit that referenced this pull request Mar 28, 2017
@SlySven SlySven deleted the (master)_initiate_dev branch June 22, 2020 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants