<p><a class="user-mention" data-hovercard-type="user" data-hovercard-url="/users/ripcurlx/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/ripcurlx">@ripcurlx</a></p>
<p>Is this the standard way that every release branch is done?</p>
<ol>
<li>Commit changes to master</li>
<li>Cherry pick changes from master->branch</li>
<li>Add release-only changes such as translations, version numbers, data stores on branch</li>
<li>Merge release-only changes to master after release</li>
</ol>
<p>What happens if there are changes that are only on the branch because <code>master</code> has changed by the time the merge happens? Who handles the merge?</p>
<p>What is the downside of adding all the changes that were originally just on the branch to go to <code>master</code> first and cherry-picked to the branch?</p>
<p>I know there are a ton of branching models so just want to understand this one :)</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/3756?email_source=notifications&email_token=AJFFTNSOQKLWJMQI6VHRYMDQXKJ73A5CNFSM4JWS2CM2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEGE6A5A#issuecomment-562684020">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNRSOHWIC3JVSP7LMZ3QXKJ73ANCNFSM4JWS2CMQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNXHMQOSTK2ULFIQCUDQXKJ73A5CNFSM4JWS2CM2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEGE6A5A.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/3756?email_source=notifications\u0026email_token=AJFFTNSOQKLWJMQI6VHRYMDQXKJ73A5CNFSM4JWS2CM2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEGE6A5A#issuecomment-562684020",
"url": "https://github.com/bisq-network/bisq/pull/3756?email_source=notifications\u0026email_token=AJFFTNSOQKLWJMQI6VHRYMDQXKJ73A5CNFSM4JWS2CM2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEGE6A5A#issuecomment-562684020",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>