Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Makefile and changelog#56

Closed
VicDeo wants to merge 2 commits intomasterfrom
makefile
Closed

Makefile and changelog#56
VicDeo wants to merge 2 commits intomasterfrom
makefile

Conversation

@VicDeo
Copy link
Member

@VicDeo VicDeo commented Nov 29, 2017

Add changelog, copying, makefile, gitignore

@patrickjahns patrickjahns mentioned this pull request Nov 29, 2017
19 tasks
@VicDeo
Copy link
Member Author

VicDeo commented Nov 29, 2017

@patrickjahns

@VicDeo VicDeo changed the title Makefile Makefile and changelog Nov 29, 2017
@patrickjahns
Copy link
Contributor

patrickjahns commented Nov 30, 2017

Since this is related to the release, can you please rebase/target against https://github.com/owncloud/templateeditor/tree/release/0.2.0

@VicDeo
Copy link
Member Author

VicDeo commented Nov 30, 2017

@patrickjahns I see no need to recreate makefile/changelog for every release.
So master should have these changes too.
Opened another PR against release/0.2.0 #57

@patrickjahns
Copy link
Contributor

@VicDeo

During the conference, it was agreed to follow the "oneflow" for release branches - see here: http://endoflineblog.com/oneflow-a-git-branching-model-and-workflow#starting-a-release-branch

You are correct, the makefile should not be create for every release. Yet once this release is ready, the changes from the release branch would flow back into the development branch (master).

Adding/Updating the changelog is something that is finalized during the release process (when we started a release branch). The release will contain changes required to make a certain application release ready (this might include final fixes for bugs discovered during qa / and also changes to changelog/release scripts etc.)

Sorry for the confusion / If the information was not communicated properly

@VicDeo
Copy link
Member Author

VicDeo commented Dec 4, 2017

closing then

@VicDeo VicDeo closed this Dec 4, 2017
@VicDeo VicDeo deleted the makefile branch December 4, 2017 13:32
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