+- Dolphin, the GameCube and Wii emulator - Forums (https://forums.dolphin-emu.org)
+-- Forum: Dolphin Emulator Discussion and Support (https://forums.dolphin-emu.org/Forum-dolphin-emulator-discussion-and-support)
+--- Forum: Development Discussion (https://forums.dolphin-emu.org/Forum-development-discussion)
+--- Thread: SVN Tortoise - merge files (/Thread-svn-tortoise-merge-files)
SVN Tortoise - merge files - matejdro - 02-16-2010
Im doint some costumization to dolphins code but now i still wants to keep code up to date.
Is there any way to make tortoise merge changes on SVN with my changes or at least warn that there is updated version of modified file on SVN?
RE: SVN Tortoise - merge files - James333 - 02-16-2010
every time you checkout Tortoise automatically merges the modified files ( and tells you if there is a conflict )
RE: SVN Tortoise - merge files - matejdro - 02-16-2010
Yes checkout, but what about rigth click --> update ?
RE: SVN Tortoise - merge files - James333 - 02-16-2010
(02-16-2010, 10:35 AM)matejdro Wrote: Yes checkout, but what about rigth click --> update ?works in the same way