TortoiseMerge: is there a way to hide deleted lines in the merge window

Posted by baash05 on Stack Overflow See other posts from Stack Overflow or by baash05
Published on 2010-05-17T22:34:35Z Indexed on 2010/05/17 22:40 UTC
Read the original article Hit count: 250

Filed under:

tortoisemerge

|

rtfm

Hello, I am attempting to merge a large quantity of files. Several of these files are in conflict and TortoiseMerge is the tool of choice.

When I view the code in the "merged" windows it shows me all the code that was deleted and added as well as ??? for code that is in-conflict. I am not really sure why it shows me the deleted code, but I do know that I don't want to see it. Seeing lines of code that were removed in a window that is "the results" doesn't make any sense; and, it makes it harder to read the.

Is there a way to hide the deleted code in that "results" window so only the text that is actually going to be in the file, shows up?

I have read the manual (cursively) and I didn't see anything in there that indicated how to accomplish this (seemingly insignificant) task.

© Stack Overflow or respective owner

Related posts about tortoisemerge

TortoiseMerge: is there a way to hide deleted lines in the merge window

as seen on Stack Overflow - Search for 'Stack Overflow'
Hello, I am attempting to merge a large quantity of files. Several of these files are in conflict and TortoiseMerge is the tool of choice. When I view the code in the "merged" windows it shows me all the code that was deleted and added as well as ??? for code that is in-conflict. I am not really… >>> More
Make the 3rd (merge preview) pane in TortoiseMerge bigger.

as seen on Super User - Search for 'Super User'
How can I make the 3rd (merge preview) pane in TortoiseMerge bigger? Right now it shows 2 lines. >>> More
How can I combine code from an old revision when I didn't branch in TortoiseMerge?

as seen on Super User - Search for 'Super User'
I need to combine (merge?) some parts of an old revision with a newer revision of a file. I'm still pretty new to subversion, so I'm not sure what I'll bomb in the process. I did not branch--these are simply different revisions of a file. How do I send the sections of code from r1 to r3 where they… >>> More
How to configure Beyond Compare 3 for Eclipse conflict resolution?

as seen on Stack Overflow - Search for 'Stack Overflow'
What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution? In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts. The default parameters are: "${yours}" "${theirs}" "${base}" "${merged}" And… >>> More
Branching and Merging with TortoiseSVN

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
For this example I am using Visual Studio 2010, TortoiseSVN 1.6.6, Subversion 1.6.6 and AnkhSVN 2.1.7819.411, so if you are using different versions, some of these screen shots may differ. This is assuming you have your code checked in to the trunk directory and have a standard SVN structure of trunk… >>> More

Related posts about rtfm

NHibernate & Castle ActiveRecord - learn by doing or RTFM?

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm a complete noob to NHibernate & ActiveRecord. What would you say is the best way to start using them productively - following the manuals step by step, or progress in small steps by actually using it and cross the problems as I encounter them? >>> More
TortoiseMerge: is there a way to hide deleted lines in the merge window

as seen on Stack Overflow - Search for 'Stack Overflow'
Hello, I am attempting to merge a large quantity of files. Several of these files are in conflict and TortoiseMerge is the tool of choice. When I view the code in the "merged" windows it shows me all the code that was deleted and added as well as ??? for code that is in-conflict. I am not really… >>> More
How do I politely tell a colleague to RTFM?

as seen on Stack Overflow - Search for 'Stack Overflow'
I think by now, I've transitioned from a junior developer to an "intermediate" developer. Previously, whenever someone would ask me a question, I'd gleefully answer them simply because I was happy to be of use to someone and wanted to prove my worth as a developer. Now it's gotten to the point where… >>> More
Taking learning into account in a development process

as seen on Stack Overflow - Search for 'Stack Overflow'
How to deal with the fact that you don't know the language/framework in a development process? For instance, suppose a group of Java developers are about to start a .NET project, they don't know the platform well and might end up finding solutions that the framework already solves or solves better… >>> More
retrieving headers / comment blocks

as seen on Super User - Search for 'Super User'
I have a number of log files that look like this: /* header arbitrary number of lines */ blah blah blah blah Using simple Bash commands (preferably sed, not awk), how would I retrieve only the header lines (ideally including the comment markers)? I've RTFM and tried googling, also found some hints… >>> More