StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>Just merge branch to any TARGET</p> <p><em>Edit</em></p> <p>OK, extended answer: "Merge for Dummies" in pictures</p> <p><strong>Preface</strong></p> <p>OK, I will not mask or hide used proving ground.</p> <p>Used in this sample resources:</p> <ul> <li>Repository "Hello, World" <a href="http://mayorat.ursinecorner.ru:8088/svn/Hello/" rel="noreferrer">http://mayorat.ursinecorner.ru:8088/svn/Hello/</a> <ul> <li>Branch <a href="http://mayorat.ursinecorner.ru:8088/svn/Hello/branches/branche-francaise" rel="noreferrer">http://mayorat.ursinecorner.ru:8088/svn/Hello/branches/branche-francaise</a></li> <li>Trunk of repo <a href="http://mayorat.ursinecorner.ru:8088/svn/Hello/trunk" rel="noreferrer">http://mayorat.ursinecorner.ru:8088/svn/Hello/trunk</a></li> </ul></li> </ul> <p><img src="https://i.stack.imgur.com/OVv4I.png" alt="Repo Graph"></p> <ul> <li>Local directory <code>z:\WC-Trunk</code> (WC of trunk, used in process)</li> <li>TortoiseSVN 1.8.1, Build 24570 - 32 Bit</li> </ul> <p><strong>Steps to reproduce</strong></p> <p>In order to merge branch to trunk, I have to have Working Copy of trunk, thus - trunk's HEAD checkouted to WC-Trunk</p> <pre><code>z:\WC-Trunk>svn ls Dr?p?r.ma?ar.sv?nskan.man.eller.smalensk?n.txt Hello.de.txt Hello.en.txt Hello.eo.txt Hello.fr.txt </code></pre> <p>it's needed WC</p> <pre><code>z:\WC-Trunk>svn info Path: . Working Copy Root Path: Z:\WC-Trunk URL: http://mayorat.ursinecorner.ru:8088/svn/Hello/trunk Relative URL: ^/trunk ... </code></pre> <p>Start merging</p> <p><img src="https://i.stack.imgur.com/0fszK.png" alt="Start"></p> <p>Select "Merge range", because "This method covers the case when you have made one or more revisions to a branch (or to the trunk) and you want to port those changes across to a different branch"</p> <p><img src="https://i.stack.imgur.com/m4Ufq.png" alt="Merge type"></p> <p>Select all revisions, if otherwise not defined and path to tree in repository, which have to be merged to trunk (our French branch)</p> <p><img src="https://i.stack.imgur.com/VZ8fS.png" alt="Merge Options"></p> <p>Define (if needed) some additional merge options, can test merge in order to detect, will be conflict resolution needed in any form, or just start <strong>real merge process</strong> at last</p> <p><img src="https://i.stack.imgur.com/drpd8.png" alt="Options 2"></p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

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