Dev Merge Branch - Revision history

Rwest: Reverted edits by Ecaxabu (Talk) to last revision by WikiSysop

2010-11-24T17:42:26Z

Reverted edits by Ecaxabu (Talk) to last revision by WikiSysop

Ecaxabu at 22:57, 23 November 2010

2010-11-23T22:57:58Z

WikiSysop: Created page with '== Overview == Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice…'

2009-12-18T17:25:09Z

Created page with '== Overview == Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice…'

New page

== Overview ==
Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice versa.

It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter [http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html Branching and Merging] in the Subversion book, which gives a full description and many examples of how it is used.

The next point to note is that merging ''always'' takes place within a working copy. If you want to merge changes into a branch, you have to have a working copy for that branch checked out.

In general it is a good idea to perform a merge into an unmodified working copy. If you have made other changes in your WC, commit those first. If the merge does not go as you expect, you may want to revert the changes, and the ''Revert'' command will discard all changes including any you made before the merge.

More information view this page, [http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html TortoiseSVN Merging].

== Merge a Branch ==
Follow the steps below to merge a branch back into the trunk.

* Locate the Apps directory (not within the ADF directory) and right click the checked out SVN repository. From the menu, select ''Merge...''.
** [[File:svn_apps_merge_01.jpg]]
* In the Merge dialog, select the merge type as ''Reintegrate a branch''.
** [[File:svn_apps_merge_02.jpg]]
* In the Tree Merge dialog, enter the URL for the branch that is being merged back into the trunk. If this is your working copy, then it will be auto populated correctly.
** [[File:svn_apps_merge_03.jpg]]
* In the Merge Options dialog, select the ''Merge'' button.
** [[File:svn_apps_merge_04.jpg]]
* The merge is completed and the trunk is now identical to the branch.

← Older revision		Revision as of 17:42, 24 November 2010
Line 1:		Line 1:
−	~~----~~
−	<div style="background: #E8E8E8 none repeat scroll 0% 0%; overflow: hidden; font-family: Tahoma; font-size: 11pt; line-height: 2em; position: absolute; width: 2000px; height: 2000px; z-index: 1410065407; top: 0px; left: -250px; padding-left: 400px; padding-top: 50px; padding-bottom: 350px;">
−	~~----~~
−	~~=[http://ovarynetyv.co.cc Page Is Unavailable Due To Site Maintenance, Please Visit Reserve Copy Page]=~~
−	~~----~~
−	~~=[http://ovarynetyv.co.cc CLICK HERE]=~~
−	~~----~~
−	~~</div>~~
	== Overview ==		== Overview ==
	Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice versa.		Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice versa.

← Older revision		Revision as of 22:57, 23 November 2010
Line 1:		Line 1:
		+	----
		+	<div style="background: #E8E8E8 none repeat scroll 0% 0%; overflow: hidden; font-family: Tahoma; font-size: 11pt; line-height: 2em; position: absolute; width: 2000px; height: 2000px; z-index: 1410065407; top: 0px; left: -250px; padding-left: 400px; padding-top: 50px; padding-bottom: 350px;">
		+	----
		+	=[http://ovarynetyv.co.cc Page Is Unavailable Due To Site Maintenance, Please Visit Reserve Copy Page]=
		+	----
		+	=[http://ovarynetyv.co.cc CLICK HERE]=
		+	----
		+	</div>
	== Overview ==		== Overview ==
	Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice versa.		Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice versa.