[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Conflict Resolver for Merging branch
|
From: |
Nirvann |
|
Subject: |
Conflict Resolver for Merging branch |
|
Date: |
Sun, 16 Aug 2009 21:33:38 -0700 (PDT) |
I am trying to merge two version of same file, one from trunk and other one
from branch using the netbeans conflict resolver. Actually I want code from
both the files to be there in the merged file. How can I do this.
regards,
nirvan.
--
View this message in context:
http://www.nabble.com/Conflict-Resolver-for-Merging-branch-tp25000889p25000889.html
Sent from the Gnu - Cvs - Info mailing list archive at Nabble.com.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Conflict Resolver for Merging branch,
Nirvann <=