100 keyboard shortcuts

100 keyboard shortcuts
*************** *************** ********************

* CTRL+C (Copy)
* CTRL+X (Cut)
* CTRL+V (Paste)
* CTRL+Z (Undo)
* DELETE (Delete)
* SHIFT+DELETE (Delete the selected item
permanently without placing the item in the
Recycle Bin)
* CTRL while dragging an item (Copy the
selected item)
* CTRL+SHIFT while dragging an item (Create a
shortcut to the selected item)
* F2 key (Rename the selected item)
* CTRL+RIGHT ARROW (Move the insertion
point to the beginning of the next word)
* CTRL+LEFT ARROW (Move the insertion point
to the beginning of the previous word)
* CTRL+DOWN ARROW (Move the insertion
point to the beginning of the next paragraph)
* CTRL+UP ARROW (Move the insertion point
to the beginning of the previous paragraph)
* CTRL+SHIFT with any of the arrow keys
(Highlight a block of text)
* SHIFT with any of the arrow keys (Select
more than one item in a window or on the
desktop, or select text in a document)
* CTRL+A (Select all)
* F3 key (Search for a file or a folder)
* ALT+ENTER (View the properties for the
selected item)
* ALT+F4 (Close the active item, or quit the
active program)
* ALT+ENTER (Display the properties of the
selected object)
* ALT+SPACEBAR (Open the shortcut menu for
the active window)
* CTRL+F4 (Close the active document in
programs that enable you to have multiple
documents open simultaneously)
* ALT+TAB (Switch between the open items)
* ALT+ESC (Cycle through items in the order
that they had been opened)
* F6 key (Cycle through the screen elements in
a window or on the desktop)
* F4 key (Display the Address bar list in My
Computer or Windows Explorer)
* SHIFT+F10 (Display the shortcut menu for
the selected item)
* ALT+SPACEBAR (Display the System menu for
the active window)
* CTRL+ESC (Display the Start menu)
* ALT+Underlined letter in a menu name
(Display the corresponding menu)
* Underlined letter in a command name on an
open menu (Perform the corresponding
command)
* F10 key (Activate the menu bar in the active
program)
* RIGHT ARROW (Open the next menu to the
right, or open a submenu)
* LEFT ARROW (Open the next menu to the
left, or close a submenu)
* F5 key (Update the active window)
* BACKSPACE (View the folder one level up in
My Computer or Windows Explorer)
* ESC (Cancel the current task)
* SHIFT when you insert a CD-ROM into the CD-
ROM drive (Prevent the CD-ROM from
automatically playing)
Dialog Box Keyboard Shortcuts
--------------- --------------- --------------- ----------
* CTRL+TAB (Move forward through the tabs)
* CTRL+SHIFT+TAB (Move backward through
the tabs)
* TAB (Move forward through the options)
* SHIFT+TAB (Move backward through the
options)
* ALT+Underlined letter (Perform the
corresponding command or select the
corresponding option)
* ENTER (Perform the command for the active
option or button)
* SPACEBAR (Select or clear the check box if
the active option is a check box)
* Arrow keys (Select a button if the active
option is a group of option buttons)
* F1 key (Display Help)
* F4 key (Display the items in the active list)
* BACKSPACE (Open a folder one level up if a
folder is selected in the Save As or Open
dialog box)
Microsoft Natural Keyboard Shortcuts
--------------- --------------- --------------- ----------
* Windows Logo (Display or hide the Start
menu)
* Windows Logo+BREAK (Display the System
Properties dialog box)
* Windows Logo+D (Display the desktop)
* Windows Logo+M (Minimize all of the
windows)
* Windows Logo+SHIFT+M (Restore the
minimized windows)
* Windows Logo+E (Open My Computer)
* Windows Logo+F (Search for a file or a
folder)
* CTRL+Windows Logo+F (Search for
computers)
* Windows Logo+F1 (Display Windows Help)
* Windows Logo+ L (Lock the keyboard)
* Windows Logo+R (Open the Run dialog
box)
* Windows Logo+U (Open Utility Manager)
Accessibility Keyboard Shortcuts
--------------- --------------- --------------- ----------
* Right SHIFT for eight seconds (Switch
FilterKeys either on or off)
* Left ALT+left SHIFT+PRINT SCREEN (Switch
High Contrast either on or off)
* Left ALT+left SHIFT+NUM LOCK (Switch the
MouseKeys either on or off)
* SHIFT five times (Switch the StickyKeys either
on or off)
* NUM LOCK for five seconds (Switch the
ToggleKeys either on or off)
* Windows Logo +U (Open Utility Manager)
Windows Explorer Keyboard Shortcuts
--------------- --------------- --------------- ----------
* END (Display the bottom of the active
window)
* HOME (Display the top of the active window)
* NUM LOCK+Asterisk sign (*) (Display all of
the subfolders that are under the selected
folder)
* NUM LOCK+Plus sign (+) (Display the
contents of the selected folder)
* NUM LOCK+Minus sign (-) (Collapse the
selected folder)
* LEFT ARROW (Collapse the current selection
if it is expanded, or select the parent folder)
* RIGHT ARROW (Display the current selection
if it is collapsed, or select the first subfolder)
Shortcut Keys for Character Map
--------------- --------------- --------------- ----------
* After you double-click a character on the
grid of characters, you can move through the
grid by using the keyboard shortcuts:
* RIGHT ARROW (Move to the right or to the
beginning of the next line)
* LEFT ARROW (Move to the left or to the end
of the previous line)
* UP ARROW (Move up one row)
* DOWN ARROW (Move down one row)
* PAGE UP (Move up one screen at a time)
* PAGE DOWN (Move down one screen at a
time)
* HOME (Move to the beginning of the line)
* END (Move to the end of the line)
* CTRL+HOME (Move to the first character)
* CTRL+END (Move to the last character)
* SPACEBAR (Switch between Enlarged and
Nor mal mode when a character is selected)
Microsoft Management Console (MMC) Main
Window Keyboard Shortcuts
--------------- --------------- --------------- ----------
* CTRL+O (Open a saved console)
* CTRL+N (Open a new console)
* CTRL+S (Save the open console)
* CTRL+M (Add or remove a console item)
* CTRL+W (Open a new window)
* F5 key (Update the content of all console
windows)
* ALT+SPACEBAR (Display the MMC window
menu)
* ALT+F4 (Close the console)
* ALT+A (Display the Action menu)
* ALT+V (Display the View menu)
* ALT+F (Display the File menu)
* ALT+O (Display the Favorites menu)
MMC Console Window Keyboard Shortcuts
--------------- --------------- --------------- ----------
* CTRL+P (Print the current page or active
pane)
* ALT+Minus sign (-) (Display the window
menu for the active console window)
* SHIFT+F10 (Display the Action shortcut
menu for the selected item)
* F1 key (Open the Help topic, if any, for the
selected item)
* F5 key (Update the content of all console
windows)
* CTRL+F10 (Maximize the active console
window)
* CTRL+F5 (Restore the active console
window)
* ALT+ENTER (Display the Properties dialog
box, if any, for the selected item)
* F2 key (Rename the selected item)
* CTRL+F4 (Close the active console window.
When a console has only one console
window, this shortcut closes the console)
Remote Desktop Connection Navigation
--------------- --------------- --------------- ----------
* CTRL+ALT+END (Open the m*cro$oft
Windows NT Security dialog box)
* ALT+PAGE UP (Switch between programs
from left to right)
* ALT+PAGE DOWN (Switch between programs
from right to left)
* ALT+INSERT (Cycle through the programs in
most recently used order)
* ALT+HOME (Display the Start menu)
* CTRL+ALT+BREAK (Switch the client
computer between a window and a full
screen)
* ALT+DELETE (Display the Windows menu)
* CTRL+ALT+Minus sign (-) (Place a snapshot
of the active window in the client on the
Terminal server clipboard and provide the
same functionality as pressing PRINT SCREEN
on a local computer.)
* CTRL+ALT+Plus sign (+) (Place a snapshot of
the entire client window area on the Terminal
server clipboard and provide the same
functionality as pressing ALT+PRINT SCREEN
on a local computer.)
Internet Explorer navigation
--------------- --------------- --------------- ----------
* CTRL+B (Open the Organize Favorites dialog
box)
* CTRL+E (Open the Search bar)
* CTRL+F (Start the Find utility)
* CTRL+H (Open the History bar)
* CTRL+I (Open the Favorites bar)
* CTRL+L (Open the Open dialog box)
* CTRL+N (Start another instance of the
browser with the same Web address)
* CTRL+O (Open the Open dialog box, the
same as CTRL+L)
* CTRL+P (Open the Print dialog box)
* CTRL+R (Update the current Web page)
* CTRL+W (Close the current window)

The Best Tools to Easily Perform Remote Tech Support

“Help, my computer is broken!” comes the phone call yet again. If you’re stuck playing tech support for family or friends, there are many free tools that allow you to remotely access the other person’s computer and fix it.

There are a million and one remote tech support options out there. We’ll look at the best ones here, whether you need to walk them through downloading one over the phone or want to set up remote access ahead of time.

TeamViewer

TeamViewer is the remote support tool of choice for many geeks. It can be used in several different ways. You can direct your partner to download the TeamViewer QuickSupport application, which can run without administrator access or any system configuration. It will give them a session ID and password that they can give to you, allowing you to easily remotely connect from your TeamViewer program. There’s no setup process here — just download the appropriate program and double-click it to launch it.



You could also opt to set up unattended access after installing the full TeamViewer client, giving you permanent remote access to the computer without the remote user having to give you any passwords or confirm anything. As long as their computer is on, you’ll be able to access it remotely. If you want to do preventative maintenance or fix their computer while they’re not around, this is a convenient option.


TeamViewer is also cross-platform, so you can use it to troubleshoot a Mac or troubleshoot your parents’ Windows computer from your Linux PC. You can even remotely connect from an Android or iOS device. We’ve taken an in-depth look at TeamViewer in the past.

Windows Remote Assistance

Windows has a built-in remote assistance feature designed for just this situation. While only Professional editions of Windows can use the remote desktop server software, every version of Windows can send a remote assistance invitation and invite someone else to assist with their computers. This can be a convenient option because it’s already installed on the remote Windows computer, so you don’t have to walk the person through installing anything.

To use this feature, tell the other person to launch Windows Remote Assistance — either by opening the Start menu, typing Windows Remote, and pressing Enter or navigating to Start -> All Programs -> Maintenance -> Windows Remote Assistance.

They’ll need to use the Invite someone you trust to help you option and then select Easy Connect, which will give them a password.

Note that Easy Connect won’t always be available — if it isn’t, the remote user will have to create an invitation file using the Windows Remote Assistance app and send it to you.


You’ll need to open the Windows Remote Assistance application on your computer, choose Help someone who has invited you, select Easy Connect, and enter the password. If Easy Connect isn’t available, you’ll have to provide the invitation file.

After they approve your connection, you’ll be able to see and control their desktop remotely so you can begin cleaning it of viruses, removing toolbars, or dealing with whatever other problems are there. Read our in-depth walkthrough to Windows Remote Assistance for more information.


Windows Remote Assistance can help in a pinch, but it’s not the ideal permanent solution. If you find yourself needing to connect regularly, there’s no way to connect without having the other person open the Remote Assistance app and tell you the password. If a solution that allows you to remotely log in without pestering the other person is ideal, set up TeamViewer or a similar program instead.

Chrome Remote Desktop

There’s a good chance both you and your recipient already have Google’s Chrome browser installed on your computers. If you do, you can use Chrome Remote Desktop app to connect to them remotely.
To do this, both you and the other person will need to have the Chrome Remote Desktop app installed. The other person will need to open the Chrome Remote Desktop app from their new tab page and click Enable remote connections.

They’ll then need to click the Share button to share their computer with someone, which will give them an access code.

Once they provide you with the access code, you’ll be able to open the Chrome Remote Desktop app, click the Access button, and enter the access code. You’ll then be connected to their computer.


You could also try setting up a PIN for permanent remote access. Like TeamViewer, this tool is cross-platform and also works on Mac, Linux, and Chrome OS. It will also likely be more robust than Windows Remote Assistance, as it shouldn’t fail — unlike the Easy Connect option in Windows Remote Assistance.
We’ve previously covered using Google Chrome to remotely access your computers.

More Options

Sure, there are more options, but they’re not all ideal. Skype has a screen-sharing feature, which is convenient because so many people have Skype installed — but Skype’s screen sharing feature doesn’t allow you to control the PC remotely, so you’d have to walk the person through clicking on the correct things.

LogMeIn is another remote desktop solution that’s occasionally used, but it’s much more focused on paid solutions for businesses. TeamViewer seems to be a better option for the average geek.
You could try enabling Remote Desktop in Windows for permanent remote access, but that would require the other person have a Professional version of Windows or better — not too common with average users. This would also require port forwarding to make the machine accessible from the Internet.


You could also set up a VNC server, which is the manual way of doing this. A VNC server is essentially a free alternative to Windows Remote Desktop, so you could install it on any edition of Windows. However, VNC servers are just a server — you have to manually forward ports and ensure it’s remotely accessible yourself. This is much more painful than just using one of the above solutions, which handles the connection setup itself without any messy port-forwarding.

Ultimately, you’re probably better off with TeamViewer. It’s easy to use, whether you’re trying to get the other person to download the QuickSupport application — no administrator access needed — and give you a password or configure remote, unattended access so you can always access their PC. The remote assistance features built into Windows and Chrome could also be useful as they should be quick to set up if you’re already using Windows or Chrome.

---

If you constantly find yourself having to perform remote tech support for the same people, you may want to get your relatives off of Windows entirely. Consider giving them a Mac, Chromebook, Linux PC, iPad, Android tablet — anything that’s more difficult to mess up than a good old-fashioned Windows desktop.

How To Troubleshoot Internet Connection Problems

Internet connection problems can be frustrating. Rather than mashing F5 and desperately trying to reload your favorite website when you experience a problem, here are some ways you can troubleshoot the problem and identify the cause.

Ensure you check the physical connections before getting too involved with troubleshooting. Someone could have accidentally kicked the router or modem’s power cable or pulled an Ethernet cable out of a socket, causing the problem.
Image Credit: photosteve101 on Flickr

Ping

One of the first things to try when your connection doesn’t seem to be working properly is the ping command. Open a Command Prompt window from your Start menu and run a command like ping google.com or ping howtogeek.com.

This command sends several packets to the address you specify. The web server responds to each packet it receives. In the command below, we can see that everything is working fine – there’s 0% packet loss and the time each packet takes is fairly low.


If you see packet loss (in other words, if the web server didn’t respond to one or more of the packets you sent), this can indicate a network problem. If the web server sometimes takes a much longer amount of time to respond to some of your other packets, this can also indicate a network problem. This problem can be with the website itself (unlikely if the same problem occurs on multiple websites), with your Internet service provider, or on your network (for example, a problem with your router).

Note that some websites never respond to pings. For example, ping microsoft.com will never results in any responses.

Problems With a Specific Website

If you’re experiencing issues accessing websites and ping seems to be working properly, it’s possible that one (or more) websites are experiencing problems on their end.

To check whether a website is working properly, you can use Down For Everyone Or Just For Me, a tool that tries to connect to websites and determine if they’re actually down or not. If this tool says the website is down for everyone, the problem is on the website’s end.


If this tool says the website is down for just you, that could indicate a number of things. It’s possible that there’s a problem between your computer and the path it takes to get to that website’s servers on the network. You can use the traceroute command (for example, tracert google.com) to trace the route packets take to get to the website’s address and see if there are any problems along the way. However, if there are problems, you can’t do much more than wait for them to be fixed.

Modem & Router Issues

If you are experiencing problems with a variety of websites, they may be caused by your modem or router. The modem is the device that communicates with your Internet service provider, while the router shares the connection among all the computers and other networked devices in your household. In some cases, the modem and router may be the same device.

Take a look at the router. If green lights are flashing on it, that’s normal and indicates network traffic. If you see a steady, blinking orange light, that generally indicates the problem. The same applies for the modem – a blinking orange light usually indicates a problem.


If the lights indicate that either devices are experiencing a problem, try unplugging them and plugging them back in. This is just like restarting your computer. You may also want to try this even if the lights are blinking normally – we’ve experienced flaky routers that occasionally needed to be reset, just like Windows computers. Bear in mind that it may take your modem a few minutes to reconnect to your Internet service provider.

If you still experience problems, you may need to perform a factory reset on your router or upgrade its firmware. To test whether the problem is really with your router or not, you can plug your computer’s Ethernet cable directly into your modem. If the connection now works properly, it’s clear that the router is causing you problems.
Image Credit: Bryan Brenneman on Flickr

Issues With One Computer

If you’re only experiencing network problems on one computer on your network, it’s likely that there’s a software problem with the computer. The problem could be caused by a virus or some sort of malware or an issue with a specific browser.

Do an antivirus scan on the computer and try installing a different browser and accessing that website in the other browser. There are lots of other software problems that could be the cause, including a misconfigured firewall.

DNS Server Problems

When you try to access Google.com, your computer contacts its DNS server and asks for Google.com’s IP address. The default DNS servers your network uses are provided by your Internet service provider, and they may sometimes experience problems.

You can try accessing a website at its IP address directly, which bypasses the DNS server. For example, plug this address into your web browser’s address bar to visit Google directly:

http://74.125.224.72

If the IP address method works but you still can’t access google.com, it’s a problem with your DNS servers. Rather than wait for your Internet service provider to fix the problem, you can try using a third-party DNS server like OpenDNS or Google Public DNS.

---

Ultimately, most connection problems you’ll run into are probably someone else’s problem – you can’t necessarily solve them yourself. Often, the only thing you can do is wait for your Internet service provider or a specific website to fix the problem you’re experiencing. (However, restarting a flaky router can solve lots of problems.)

If you are experiencing problems, you can always try calling your Internet service provider on the phone – you’re paying them for this service, after all. They will also be able to tell you whether it’s a problem that other users are also having — or whether it’s a problem on your end.

How to Sync External Folders with Your SkyDrive

Microsoft launched its new SkyDrive desktop app which is set to compete head-to-head with Dropbox and Google Drive. Here’s how to sync folders that are outside of your SkyDrive folder.

Using a Reparse Point

Known as the Soft Link to some, a Symbolic Link is the most common form of reparse point. Luckily for us Windows Vista and later include a command line utility, called mklink, which can be used to manage symbolic links. In order to create a symbolic link we first need to find your SkyDrive folder which, buy default, is located at:

C:\Users\”Your Username”\SkyDrive

This is also known as the %userprofile% environment variable, which makes it extra easy to create a symbolic link. So go ahead and fire up a administrative command prompt.

Now we need to use mklink to create a symbolic link, the syntax to link to a folder is:

mklink /d <link> <target>

For files we don’t need the “/d” switch so we can just use:

mklink <link> <target>

But as an added bonus we can use our environment variable, so we can do something like this:

mklink /d “%userprofile%\SkyDrive\Music” C:\Music

Above I created a symbolic link that points to the Music folder on the root of my “C” drive. This means that any files I put into that folder will be automatically uploaded to my SkyDrive, you can check this by looking at your SkyDrive.

As you can see my symlink is there and functioning just as we expected. That’s all there is to it, happy symlinking

Best Visual Studio 2010 Extensions

Best Visual Studio 2010 Extensions I'm using.

Recommended extensions for Visual Studio 2010.

Snippet Designer
http://visualstudiogallery.msdn.microsoft.com/B08B0375-139E-41D7-AF9B-FAEE50F68392

JScript Editor Extensions
http://visualstudiogallery.msdn.microsoft.com/872d27ee-38c7-4a97-98dc-0d8a431cc2ed

Entity Framework Power Tools Beta 2
http://visualstudiogallery.msdn.microsoft.com/72a60b14-1581-4b9b-89f2-846072eff19d

devColor
http://visualstudiogallery.msdn.microsoft.com/7dbae8b3-5812-490e-913e-7bfe17f47f1d

Image Optimizer
http://visualstudiogallery.msdn.microsoft.com/a56eddd3-d79b-48ac-8c8f-2db06ade77c3/



CodeMaid
http://visualstudiogallery.msdn.microsoft.com/76293c4d-8c16-4f4a-aee6-21f83a571496

PowerCommands for Visual Studio 2010
http://visualstudiogallery.msdn.microsoft.com/e5f41ad9-4edc-4912-bca3-91147db95b99

Spell Checker
http://visualstudiogallery.msdn.microsoft.com/7c8341f1-ebac-40c8-92c2-476db8d523ce

CSS 3 Intellisense Schema
http://visualstudiogallery.msdn.microsoft.com/7211bcac-091b-4a32-be2d-e797be0db210/

LINQ Insight
http://visualstudiogallery.msdn.microsoft.com/269e6da9-7f4d-4650-a327-c70b359dcfe0

Linqer
http://www.sqltolinq.com

Branching and Merging with TortoiseSVN || Merge Branch with Trunk || Delete a Branch ||

Overview

The discussion below assumes that you have a Subversion repository that uses the standard trunk/branches/tags structure. In other words, a repository at http://site.com/project with trunk, branches, and tags subdirectories.

I’ll also assume that you have already checked out a local working copy of trunk, and that you’ve already created an Eclipse project using this working copy.

When you want to work on a new branch you’ll follow these general steps using Subclipse, which are described in more detail below:
1-Create a new branch and switch to it
2-Develop in your branch, periodically merging the latest changes from trunk into your branch
3-When your development is complete, merge changes from your branch back into trunk
4-Delete your branch

Switch

Your local working copy reflects some directory in the remote Subversion repository. If you initially checkout trunk, then your working copy reflects trunk. If you initially checkout a branch, it reflects that branch. Using the svn switch command you can have Subversion modify your working copy to reflect another directory in the repository. Switching may not sound that exciting but it’s key to branching and merging, as you’ll soon see.

First off, ensure that your working copy has no local changes. Either commit your changes or revert them.

Next, right-click your project in Eclipse’s Project Explorer, select the Team submenu, and click the Switch to another Branch/Tag/Revision… item. All of Subclipse’s actions are in this Team menu, so from now on I’ll refer to specific actions like Team > Switch to another Branch/Tag/Revision.

In the To URL field, you specify the URL of the repository directory you want to switch your local working copy to. If your working copy initially reflects http://site.com/project/trunk, you could specify a branch as http://site.com/project/branches/somebranch. Generally you’ll want to leave all of the other options in this dialog box as they are.

Create a new Branch

Creating a new branch is almost trivial. First, switch your local copy to trunk (if it’s not already trunk). And again, make sure you have no local changes.

Next select Team > Branch/Tag… and specify http://site.com/project/branches/yourbranch in the Copy to URL field. This will create a branch named yourbranch.

Click Next and leave HEAD revision selected. Click Next again, enter a commit message like “Created the yourbranch branch”, check the “Switch working copy to new branch/tag” checkbox, and click Finish.

That’s it! You’ve created your new branch in the repository and switched your working copy to it. Now you can implement your major new features in your branch and commit them to subversion without affecting trunk.

This is assuming you have your code checked in to the trunk directory and have a standard SVN structure of trunk, branches and tags. There are a number of developers who prefer to develop solely in a branch and never touch the trunk, but the process is generally the same and you may be on a small team and prefer to work in the trunk and branch occasionally.

There are three steps to successful branching. First you branch, then when you are ready you need to reintegrate any changes that other developers may have made to the trunk in to your branch. Then finally when your branch and the trunk are in sync, you merge it back in to the trunk.


1 -Right click project root in Windows Explorer > TortoiseSVN > Branch/Tag

2 -Enter the branch label in the ‘To URL’ box. For example /branches/1.1

3 -Choose Head revision
 4-Check Switch working copy
5-Click OK
6 -Make any changes to branch

 7- Make any changes to trunk

8 - Commit any changes

For this example I copied the project to another location prior to branching and made changes to that using Notepad++. Then committed it to SVN, as this directory is mapped to the trunk, that is what gets updated.


Merge Trunk into a Branch

While you’re working on your branch, you should periodically merge the latest version of trunk into your branch to make sure you’re not straying too far away.  Eventually, you’ll also need to do this as the last step before merging your branch back into trunk, to ensure you won’t cause any conflicts with trunk.

First you’ll need to switch your working copy to your branch, if necessary.  Subversion will merge the changes from trunk into your working copy, and then you’ll commit your working copy to your branch to fully integrate the changes from trunk.  So it’s vital that you start with your working copy as a mirror of your branch.  And again, ensure you have no local changes.


1- Right click project root in Windows Explorer > TortoiseSVN > Merge

2 - Choose ‘Merge a range of revisions’

  

3- In ‘URL to merge from’ choose your trunk

4- Click Next, then the ‘test merge’ button. This will highlight any conflicts. Here we have one conflict we will need to resolve because we made a change and checked in to trunk earlier

5- Click merge. Now we have the opportunity to edit that conflict

6-This will open up TortoiseMerge which will allow us to resolve the issue. In this case I want both changes.

7- Perform an Update then Commit

8- Reloading in Visual Studio shows we have all changes that have been made to both trunk and branch.

Merge Branch with Trunk


When you’ve finished development in your branch, you need to merge your branch changes back into trunk, so everyone else can share in the glory of your awesome new feature.  This is usually where developers turn pale and run away, but fear not; Subclipse will guide you through.

Make sure you only perform this merge when you are completely finished with your branch!  After merging your branch into trunk, you will no longer be able to use your branch.  In fact, you should delete your branch after merging it into trunk (see next section).

First, merge trunk into your branch and commit any changes to your branch, as described in the previous section.  We need to make sure your branch is consistent with trunk before merging it back.

Next, switch your working copy to trunk.  Remember that Subversion merges changes into your working copy first, and then you commit them back to the repository.  So Subversion will apply your branch changes to your working copy of trunk, and then you commit those changes to trunk.

1-Switch working copy by right clicking project root in Windows Explorer > TortoiseSVN > switch

2- Switch to the trunk then ok



 
3- Right click project root in Windows Explorer > TortoiseSVN > merge

4- Choose ‘Reintegrate a branch’

5- In ‘From URL’ choose your branch then next

Click ‘Test merge’, this shouldn’t show any conflicts

Click Merge
Perform Update then Commit

Open project in Visual Studio, we now have all changes.

So there we have it we are connected back to the trunk and have all the updates merged.


Delete a Branch

As previously mentioned, after merging a branch into trunk, the branch can no longer be used.  Subversion keeps track of merges using the svn:mergeinfo property.  Because of the way it uses this property, once a branch is merged into trunk it can no longer be involved in merges properly.  For the full story, please consult the last few paragraphs of this section on branching and merging.

Subclipse does not provide a way to delete an entire branch, so you’ll need to just run this command manually:

svn delete http://site.com/project/branches/yourbranch -m "Removing completed branch"