Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@larsgrefer
larsgrefer committed Feb 16, 2016
2 parents b74e01a + e1dd2cc commit 7014031
Showing 0 changed files with 0 additions and 0 deletions.

3 comments on commit 7014031

@SecUpwN
Copy link
Member

Choose a reason for hiding this comment

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

@larsgrefer, just for my understanding: Why do you always merge back even if there are no changes?
Am I doing something wrong or do I need to change any part of my releasing procedure to avoid this?

@larsgrefer
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I wan't the tagged release commit to be present in the development branch. So the development is truly based on the last release.

If the development isn't based on the release commit, #730 will not be able to find the tag

@SecUpwN
Copy link
Member

Choose a reason for hiding this comment

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

I wan't the tagged release commit to be present in the development branch. So the development is truly based on the last release.

Thanks. So what do I have to change from the following procedure of crafting the CHANGELOG then changing the version (which will in the future resolve automatically) and doing a pull request to master?

Please sign in to comment.