Databases
StackOverflow2013
Postsdbo
POHow do you easily unmerge a topic branch in Subversion/git?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow do you easily unmerge a topic branch in Subversion/git?
    primarykey
    data
    text
    <p>So I have <code>/trunk</code>, to which all things golden are eventually committed. And I have a topic branch, <code>/topicA</code>.</p> <p>Normally, you would merge <code>/topicA</code> into trunk and it would be one commit. Hooray! To undo this merge, you just have to reverse merge the commit caused by this merge. Easy peasy.</p> <p>Now, let's say I have <code>/topicA</code> and I merge it into <code>/trunk</code>... But then I have a bugfix that relates to <code>/topicA</code>. So, should I be committing to <code>/topicA</code> again? I can even remerge <code>/topicA</code> so that <code>/trunk</code> contains <code>/topicA</code>. But how to I rollback all of <code>/topicA</code>, original work AND bugfixes, easily?</p> <p>Commit history:</p> <ul> <li>Commit to <code>/topicA</code></li> <li>Commit to <code>/topicA</code></li> <li>Commit to <code>/topicA</code></li> <li>...</li> <li>Merge <code>/topicA</code> into <code>/trunk</code></li> <li>...</li> <li>Bugfix1 to <code>/topicA</code></li> <li>Remerge <code>/topicA</code> into <code>/trunk</code> for bugfixes</li> <li>...</li> <li>Bugfix2 to <code>/topicA</code></li> <li>Bugfix3 to <code>/topicA</code></li> <li>Remerge <code>/topicA</code> into <code>/trunk</code> for bugfixes</li> <li>...</li> <li>??? (unmerge <code>/topicA</code>, bugfixes included)</li> </ul> <p>I know you can just unmerge each bugfix and then the initial merge, but that doesn't seem sexy at all.</p> <p>Does git have an answer to this as well?</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USMark Canlas
    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
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POHow do you easily unmerge a topic branch in Subversion/git?
      1. USMark Canlas
      1. VTBountyStart
    2. VO
      singulars
      1. POHow do you easily unmerge a topic branch in Subversion/git?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POHow do you easily unmerge a topic branch in Subversion/git?
      1. This table or related slice is empty.
      1. VTUpMod
    1. COIf you're not sure topicA must be included in trunk, why merge it into it? And if you're sure, why would you want to unmerge it? It might happen, sure, but it should be really rare.
      singulars
      1. POHow do you easily unmerge a topic branch in Subversion/git?
      1. USJB Nizet
    2. COSometimes non-technical forces dictate the sureness of a given topic/feature. Not ideal, sure, but it happens quite often.
      singulars
      1. POHow do you easily unmerge a topic branch in Subversion/git?
      1. USMark Canlas
    3. COAlso, sometimes bugs arise when two topics finally sit next to one another (I guess that would be "during integration").
      singulars
      1. POHow do you easily unmerge a topic branch in Subversion/git?
      1. USMark Canlas
 

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