<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
	xmlns:dc="http://purl.org/dc/elements/1.1/"
	xmlns:atom="http://www.w3.org/2005/Atom"
	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
	xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
	>

<channel>
	<title>caliberweb.com &#187; Visual SVN</title>
	<atom:link href="http://chris.caliberweb.com/tags/visual-svn/feed/" rel="self" type="application/rss+xml" />
	<link>http://chris.caliberweb.com</link>
	<description></description>
	<lastBuildDate>Mon, 01 Jun 2009 22:35:33 +0000</lastBuildDate>
	<generator>http://wordpress.org/?v=2.8.5</generator>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
			<item>
		<title>Merge To Trunk With Visual SVN</title>
		<link>http://chris.caliberweb.com/2009/02/18/merge-to-trunk-with-visual-svn/</link>
		<comments>http://chris.caliberweb.com/2009/02/18/merge-to-trunk-with-visual-svn/#comments</comments>
		<pubDate>Wed, 18 Feb 2009 21:57:33 +0000</pubDate>
		<dc:creator>Chris</dc:creator>
				<category><![CDATA[Development]]></category>
		<category><![CDATA[SVN]]></category>
		<category><![CDATA[Visual Studio]]></category>
		<category><![CDATA[Visual SVN]]></category>

		<guid isPermaLink="false">http://chris.caliberweb.com/?p=10</guid>
		<description><![CDATA[I don’t know why I never realized that merging was possible in the GUI of Visual SVN but, alas, I hadn’t. It turns out it’s been right there in front of my face all along!  
Here’s a situation I ran into today.
I have a personal branch (personal repo too) for a feature I’m working [...]]]></description>
			<content:encoded><![CDATA[<p>I don’t know why I never realized that merging was possible in the GUI of Visual SVN but, alas, I hadn’t. It turns out it’s been right there in front of my face all along! <img src='http://chris.caliberweb.com/wp-includes/images/smilies/icon_wink.gif' alt=';)' class='wp-smiley' /> </p>
<p>Here’s a situation I ran into today.</p>
<p>I have a personal branch (personal repo too) for a feature I’m working on. After the feature was complete and all was green, I want to merge the feature into the trunk. It’s really simple.</p>
<p>First thing you’ll want to do is make sure you have committed your changes to your feature branch.</p>
<p>Next go ahead and switch to the trunk of your repository.</p>
<p><a href="http://chris.caliberweb.com/wp-content/uploads/2009/02/switch.jpg"><img style="border-right: 0px; border-top: 0px; display: inline; margin-left: 0px; border-left: 0px; margin-right: 0px; border-bottom: 0px" title="switch" src="http://chris.caliberweb.com/wp-content/uploads/2009/02/switch-thumb.jpg" border="0" alt="switch" width="509" height="214" /></a></p>
<p>Now you can start the merging process by clicking the “Merge” button (duh. <img src='http://chris.caliberweb.com/wp-includes/images/smilies/icon_wink.gif' alt=';)' class='wp-smiley' />  ).</p>
<p><a href="http://chris.caliberweb.com/wp-content/uploads/2009/02/mergebutton.jpg"><img style="border-right: 0px; border-top: 0px; display: inline; border-left: 0px; border-bottom: 0px" title="merge-button" src="http://chris.caliberweb.com/wp-content/uploads/2009/02/mergebutton-thumb.jpg" border="0" alt="merge-button" width="531" height="147" /></a></p>
<p>Now the common TortoiseSVN Merge dialog will popup and you can merge like you’re already used to.</p>
<p><a href="http://chris.caliberweb.com/wp-content/uploads/2009/02/mergefrombranch.jpg"><img style="border-right: 0px; border-top: 0px; display: inline; border-left: 0px; border-bottom: 0px" title="merge-from-branch" src="http://chris.caliberweb.com/wp-content/uploads/2009/02/mergefrombranch-thumb.jpg" border="0" alt="merge-from-branch" width="514" height="468" /></a></p>
<p>-=Code Well</p>
]]></content:encoded>
			<wfw:commentRss>http://chris.caliberweb.com/2009/02/18/merge-to-trunk-with-visual-svn/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>
