If it’s an old app, I assume you are “resetting” rather than “merging” the branches.
If that is the case, then you can double click on the published
branch, then right click on the master
and reset 'published' branch to here
.
I often have problems when I put my hands on old apps. So, instead of trying to keep it working as it used to work, I always click the Publish
button and create two environments linked to two branches. I call the two environments Production
and Development
and make sure the Production
is configured with the correct url. From this point on, in simple apps where production and development are identical, which is the case in most old apps where I didn’t have the flexibility of today’s environments, I reset the prod
branch to the dev
branch rather than merging. In apps where the development has some different settings, like scheduled tasks configuration or email in test mode, I merge dev
into prod
.
The old workflow based on the Publish
button was very simple and rigid, but was working great with the old editor.
The new editor is much more powerful, but it’s confusing. There still is a branch called master
, but its meaning has changed. The Publish
button used to create a published
branch, but it doesn’t do that any longer. The behavior and the publishing workflow changes depending on how the app was setup in the Publish this app
dialog.
The old editor had a very clear and intuitive workflow. The new is messy non intuitive and inconsistent. The branch called master
can’t be renamed, but nobody knows what it does. Some use it as development, some as production. The Publish
button does something, but who knows what (hence your question). After each merge, the UI checks out another branch without asking or warning you.
Think of a world where a new app starts with two branches, one called development
and one called published
, and where developers can rename any branch. In that world people would know which branch is for development and which one is for production, and they could even rename them however they like, including a phantomatic master
.
(Sorry, this morning I woke up in rant mode)