Re: Merging from branch to mainline
Jens Miltner <[email protected]> Fri, 11 Jun 2010 10:13:11 -0700
| Newsgroups | gmane.comp.version-control.cvs.gui.user |
|---|---|
| Message-ID | <[email protected]> |
You'll do an update on the main branch and in the update options use the "Merge with changes from one revision" option, specifying the branch as the revision to merge from. HTH, -jens Am 11.06.2010 um 09:26 schrieb Rez P <[email protected]>: > > Hi > > I don't see a command or button to merge branched files into their counterpart files on the mainline. Is there such a thing in Wincvs or does it have to be accomplished from the command line? > > Thanks > > Rez > > __________________________________________________________ > The New Busy is not the too busy. Combine all your e-mail accounts with Hotmail. > http://www.windowslive.com/campaign/thenewbusy?tile=multiaccount&ocid=PID28326::T:WLMTAGL:ON:WL:en-US:WM_HMP:042010_4 > > [Non-text portions of this message have been removed] > > [Non-text portions of this message have been removed] ------------------------------------ Yahoo! Groups Links <*> To visit your group on the web, go to: http://groups.yahoo.com/group/cvsgui/ <*> Your email settings: Individual Email | Traditional <*> To change settings online go to: http://groups.yahoo.com/group/cvsgui/join (Yahoo! ID required) <*> To change settings via email: [email protected] [email protected] <*> To unsubscribe from this group, send an email to: [email protected] <*> Your use of Yahoo! Groups is subject to: http://docs.yahoo.com/info/terms/