NetBeans Forums

 FAQFAQ   SearchSearch   MemberlistMemberlist   RegisterRegister   ProfileProfile   Log in to check your private messagesLog in to check your private messages   Log inLog in 
  

merge/resolve conflicts question

 
Post new topic   Reply to topic    NetBeans Forums -> NetBeans Users
View previous topic :: View next topic  
Author Message
Mitch Claborn
Posted via mailing list.





PostPosted: Thu Feb 04, 2010 6:47 pm    Post subject: merge/resolve conflicts question Reply with quote

Netbeans 6.7.1
With a project in CVS, I did a CVS update and it discovered conflicts -
the file had been modified both locally and remotely. I chose the
"resolve conflicts" menu option and it brought up this nice side by side
editor of the conflicts, but only allows you to accept one or the
other. Is that how it is designed to work? What if, as in this case, I
needed the changes from both files? Added some methods and variables
that both needed to be kept.

Maybe I'm missing something, but that kind of merge seems a bit limited.

--



Mitch Claborn
address-removed
Back to top
Thomas Wolf
Posted via mailing list.





PostPosted: Thu Feb 04, 2010 7:02 pm    Post subject: merge/resolve conflicts question Reply with quote

I asked this question before awhile back - that appears to be a limitation in the curernt setup: you can't accept changes from both sides of a conflict.  I'd love to at least be able to edit the third window and copy/paste stuff from the "rejected" change into it.  As it is, I have to do this sort of thing manually in 'vi'.

tom



On 02/04/2010 01:45 PM, Mitch Claborn wrote:
Quote:
Quote:
Netbeans 6.7.1
With a project in CVS, I did a CVS update and it discovered conflicts -
the file had been modified both locally and remotely. I chose the
"resolve conflicts" menu option and it brought up this nice side by side
editor of the conflicts, but only allows you to accept one or the
other. Is that how it is designed to work? What if, as in this case, I
needed the changes from both files? Added some methods and variables
that both needed to be kept.

Maybe I'm missing something, but that kind of merge seems a bit limited.

IMPORTANT: The contents of this email and any attachments are confidential. They are intended for the named recipient(s) only.
If you have received this email in error, please notify the system manager or the sender immediately and do not disclose the contents to anyone or make copies thereof.
*** eSafe scanned this email for viruses, vandals, and malicious content. ***
Back to top
Display posts from previous:   
Post new topic   Reply to topic    NetBeans Forums -> NetBeans Users All times are GMT
Page 1 of 1

 
Jump to:  
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
You cannot attach files in this forum
You can download files in this forum


Powered by phpBB
By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2012, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo