Skip to content
This repository has been archived by the owner on Jul 13, 2024. It is now read-only.

Adding incompatible version to showcase using support branches #163

Merged

Conversation

cardil
Copy link
Contributor

@cardil cardil commented May 23, 2017

Adding incompatible version to showcase using support branches with them.

Also I change the merge of release to be proper - develop should have a tagged master merged to it, so git describe work properly.

PS. I like G.M. :-P

@nicoespeon
Copy link
Owner

Hi @cardil,

Thanks for improving the gitflow showcase and spotting the mistake with the merge back to develop after release is done 👍

@nicoespeon nicoespeon merged commit 657d03e into nicoespeon:develop May 25, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants