Click here to Skip to main content
15,916,941 members
Home / Discussions / System Admin
   

System Admin

 
QuestionMS Outlook 2007 Pin
Civic061-Mar-11 2:12
Civic061-Mar-11 2:12 
AnswerRe: MS Outlook 2007 Pin
Dave Kreskowiak1-Mar-11 8:51
mveDave Kreskowiak1-Mar-11 8:51 
AnswerRe: MS Outlook 2007 Pin
WoutL1-Mar-11 21:56
WoutL1-Mar-11 21:56 
QuestionSource Control Question Pin
Mike Hankey26-Feb-11 10:42
mveMike Hankey26-Feb-11 10:42 
AnswerRe: Source Control Question Pin
Albert Holguin26-Feb-11 10:56
professionalAlbert Holguin26-Feb-11 10:56 
GeneralRe: Source Control Question Pin
Mike Hankey26-Feb-11 11:06
mveMike Hankey26-Feb-11 11:06 
GeneralRe: Source Control Question Pin
Albert Holguin26-Feb-11 11:09
professionalAlbert Holguin26-Feb-11 11:09 
GeneralRe: Source Control Question Pin
Albert Holguin26-Feb-11 12:01
professionalAlbert Holguin26-Feb-11 12:01 
read up a bit on the subject, you're supposed to use the "svn merge" feature (how you exactly execute this depends on your svn client, I use tortoise), the output of the merge will occur on your local copy of your trunk only therefore it should give you the ability to address conflicts before committing the merged trunk. should delete branch after merger is complete.

its always easier said than done though, i know personally there can be tons of conflicts! apparently it is suggested that occasional merges (weekly?) be done from the trunk to the branch so that the final merge from the branch back to the trunk can be a bit less painful. you can pick and choose what changes to merge from the main trunk to your branch (by specifying revision numbers to merge).
GeneralRe: Source Control Question Pin
Mike Hankey26-Feb-11 12:09
mveMike Hankey26-Feb-11 12:09 
GeneralRe: Source Control Question Pin
Albert Holguin26-Feb-11 12:14
professionalAlbert Holguin26-Feb-11 12:14 
GeneralRe: Source Control Question Pin
Albert Holguin26-Feb-11 12:10
professionalAlbert Holguin26-Feb-11 12:10 
GeneralRe: Source Control Question Pin
Mike Hankey26-Feb-11 12:24
mveMike Hankey26-Feb-11 12:24 
QuestionIIS question [modified] SOLVED Pin
Jim Crafton31-Jan-11 8:15
Jim Crafton31-Jan-11 8:15 
QuestionRe: IIS question [modified] SOLVED Pin
NOD32 user7-Feb-11 1:17
NOD32 user7-Feb-11 1:17 
AnswerRe: IIS question [modified] SOLVED Pin
Jim Crafton7-Feb-11 2:57
Jim Crafton7-Feb-11 2:57 
AnswerRe: IIS question [modified] SOLVED Pin
Roger Wright15-Mar-11 19:08
professionalRoger Wright15-Mar-11 19:08 
QuestionCreate .pdf from a .doc file with commandline Pin
Mschauder28-Jan-11 1:14
Mschauder28-Jan-11 1:14 
AnswerRe: Create .pdf from a .doc file with commandline Pin
Richard MacCutchan28-Jan-11 1:43
mveRichard MacCutchan28-Jan-11 1:43 
QuestionWindows 7 theme and battery life Pin
Kanel Roath26-Jan-11 16:24
Kanel Roath26-Jan-11 16:24 
AnswerRe: Windows 7 theme and battery life Pin
RaviRanjanKr26-Jan-11 23:01
professionalRaviRanjanKr26-Jan-11 23:01 
GeneralRe: Windows 7 theme and battery life Pin
Kanel Roath27-Jan-11 20:41
Kanel Roath27-Jan-11 20:41 
QuestionBoot Record of hard disk Pin
A_Fa16-Jan-11 0:49
A_Fa16-Jan-11 0:49 
AnswerRe: Boot Record of hard disk Pin
WoutL26-Jan-11 23:28
WoutL26-Jan-11 23:28 
QuestionWindows color scheme changed Pin
HughJarce9915-Jan-11 10:48
HughJarce9915-Jan-11 10:48 
QuestionAutomatic deployment of VNC server to remote terminals (PC's) via Remote Desktop Pin
Brady Kelly10-Jan-11 3:08
Brady Kelly10-Jan-11 3:08 

General General    News News    Suggestion Suggestion    Question Question    Bug Bug    Answer Answer    Joke Joke    Praise Praise    Rant Rant    Admin Admin   

Use Ctrl+Left/Right to switch messages, Ctrl+Up/Down to switch threads, Ctrl+Shift+Left/Right to switch pages.