Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>You are <a href="https://stackoverflow.com/questions/2351108/git-merge-two-branches-what-direction/2351522#2351522">not limited to take what your versioning tool think is common base</a>, and recording a merge like sbi <a href="https://stackoverflow.com/questions/5246765/redoing-manual-merge-with-svn-merge/5247042#5247042">suggests</a> is probably a good idea. If all else fails, you can always do the merge manually by checking out the three versions of a file and use <a href="http://kdiff3.sourceforge.net/" rel="nofollow noreferrer">KDiff3</a> directly on those like described in the answer linked above.</p> <p>If versions X and Y are from the feature branch, and versions A to E are on trunk,</p> <pre><code> A----------+ | | | | \_/ \_/ B X | | | | \_/ \_/ C &lt;======= Y Merge without being recorded by svn as a merge (right?), aka BadMerge | | \_/ D | | \_/ E </code></pre> <p>Then to redo the merge check out versions <code>A</code>, <code>Y</code> and <code>B</code> and merge with kdiff3. That will give you a new C' version which preferably will lack the bugs introduced in <code>C</code>. Then you want the rest of the changes done on trunk, so merge <code>C'</code>, <code>C</code> and <code>E</code>. That should give you a new version you can check in as version <code>F</code>.</p> <p>I do not know svn well enough to give any advice on how you should check in <code>C'</code> and how to handle that, but the steps above should at least give you the end result you want.</p>
    singulars
    1. This table or related slice is empty.
    1. PORedoing manual merge with SVN merge
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USCommunity
    1. UShlovdal
    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. This table or related slice is empty.
    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