Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>You can start with synchronizing with the trunk since this is the normal way to do so, and see what appen. In case you see there is too much difficulties solving synchronization conflicts, you can revert to your clean branch and try solution 2.</p> <p>Solution 2 may only be prefered if you are really ready to reintegrate, otherwise you will have extra work to synchronize. Or then your development branch will change from branch 1 to branch 2 where you merged, and next time you will create a branch 3 and so on ...</p> <p>Concerning resolution of conflict you can always adopt the safe strategy or "their changes" or "their full". Remind that in your workdir you can mess up things and revert. You can eventually accept all 'their conflicts' and replay your changes explicitely, which will have same effects of solution 2 without having to create temporary branch.</p> <p>Also a huge portion of changes on trunk may not be related with your development, and if you have few changes, it does not matter how much other changes there is on trunk, you will not have more conflicting code than the amount of code you wrote.</p> <p>Concerning your second question: if it can cause problem when you reintegrate, no it shouldn't provided you use the --reintegrate option. Anyway even if it will, you shouldn't worry because result of 'merge' or of 'merge --reintegrate' only applies in your workdir. So that you can test-and-fix or revert.</p> <pre><code>cd workdir svn merge ^/trunk #resolve conflicts svn ci svn update svn status -q # to ensure there is no pending changes svn switch ^/trunk svn merge --reintegrate ^/branches/your_branch # resolve conflicts and test or revert # and only if you are satisfied: svn ci svn up # if your not satisfied: svn revert svn merge --reintegrate ^/branches/your_branch # try resolve conflict in an another way ... </code></pre>
    singulars
    1. This table or related slice is empty.
    1. POSVN - best strategy to synchronize a branch
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USptitpion
    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