Databases
StackOverflow2013
Postsdbo
PORevert Git branch back to master to re-merge topic branches
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PORevert Git branch back to master to re-merge topic branches
    primarykey
    data
    text
    <p><strong>The Setup</strong></p> <p>We use the master branch for our live environment. That is, everything that's on master is fit to be deployed to the live environment.</p> <p>Similarly, we use a staging branch that our staging environment runs on.</p> <p>Any changes are developed on topic branches. These will be merged into staging for QA and once they are cleared for deployment, the topic branch is merged into master and discarded.</p> <p>Master and the topic branches live on Github, staging only exists locally and in a repository to build the staging environment from.</p> <p><strong>The Problem</strong></p> <p>Sometimes the topic branches mount up. They've been merged into staging but for whatever reasons (time constraints on customer side, external dependencies, etc) they are not cleared to go live. Usually this isn't a problem and they just remain in staging for a while longer.</p> <p>But now I have several branches that are probably not going to go live for several months and they are starting to cause merge conflicts when new topic branches arrive in staging.</p> <p>So what I'd like to do is cleaning the slate: Essentially revert the staging branch back to the latest commit on master, then re-apply all topic branches that are likely to get done in the near future. After that I want to be able to push the reverted staging branch to the remote repo our staging environment uses for deployment without having to do extra clean-up in said repository.</p> <p>How do I do this? Thank you very much. </p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USLunikon
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload