[bisq-network/bisq] Release/v1.2.4 (#3756)

[Julian Knutsen]

@ripcurlx

Is this the standard way that every release branch is done?

1) Commit changes to master
2) Cherry pick changes from master->branch
3) Add release-only changes such as translations, version numbers, data stores on branch
4) Merge release-only changes to master after release

What happens if there are changes that are only on the branch because `master` has changed by the time the merge happens? Who handles the merge?

What is the downside of adding all the changes that were originally just on the branch to go to `master` first and cherry-picked to the branch?

I know there are a ton of branching models so just want to understand this one :)

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/3756#issuecomment-562684020
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20191206/df05e9d1/attachment.html>