Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into develop (take 3) #84

Merged
merged 5 commits into from
Feb 8, 2020
Merged

Conversation

jonoomph
Copy link
Member

@jonoomph jonoomph commented Feb 8, 2020

No description provided.

…ious tag. During a release, we tag the current commit during the publishing, and then it starts detecting no changes (since we are ON the current tag).
WIP: Release of libopenshot-audio 0.1.9 (SO 7)
@jonoomph
Copy link
Member Author

jonoomph commented Feb 8, 2020

It's one of those days...

@jonoomph
Copy link
Member Author

jonoomph commented Feb 8, 2020

The protected develop and master branches make resolving conflicts difficult/impossible using GitHub only, so we need to use a new branch to facilitate this. I've updated the Release Plan with these instructions for future releases.

@jonoomph jonoomph merged commit 836e49f into develop Feb 8, 2020
@jonoomph jonoomph deleted the merge-master-into-develop branch August 17, 2020 19:02
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.

None yet

1 participant