http://bugs.grommit.com/show_bug.cgi?id=279
Summary: gpyfm should have an "Accept Parent Version" and "Accept Child Version" Product: SCM Migration Version: unspecified Platform: All OS/Version: Solaris 11/Nevada Status: NEW Severity: enhancement Priority: P3 Component: fm AssignedTo: scm-migration-dev at opensolaris.org ReportedBy: stevel at sun.com Would be nice to have a way to just accept the entire parent or child's version of the file and discard the other. i.e.: the same as 'accept p' or 'accept c' from the Teamware merge. -- Configure bugmail: http://bugs.grommit.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.