Using the TFS merge tool, I can click on the left side and the right side to keep both changes/conflicts. This is needed when I add a method and another team member adds a method in the same place and I need to keep them both. In WinMerge (file merge, not folder), it seems that I can only overwrite the right with the left. Is it possible to make WinMerge copy the left to the right, and keep the right?
Check out KDiff3... best free three-way merge tool out there.
No, but you can type on the right side and also copy and paste from the left side to the right side.
I think you're looking for Merge capability. I've seen it in TortoiseMerge but not in WinMerge (though there may be some way to do it). Can you simply copy-and-paste manually from one side to the other?
Diffuse does a marvelous job of that. Don't know what Greg is talking about.
http://diffuse.sourceforge.net/
I had the same problem and found that Guiffy cand merge changes from both file A and file B.
There's a button where you can apply this kind of merging to all the differences.
Check this help page to find out how to keep both changes.
Although not free, you can use it for free for 21 days.
More than enough for my one time need.
I had this problem, but I found out that one of the files (the one of the left) was Read-only. This meant I couldn't copy anything from right to left.
From the File menu, there are options to disable or enable Read-only attribute of either file. Have them both unchecked will allow you to copy in either direction.
What Andrew said is actually quite helpful. I can't imagine that the desired functionality not be in WinMerge, but if not, copy left and right all that you can normally, then manually copy/paste the rest to get both sides identical how you want them. You can refresh after making these manual changes to see the status.
Yes, you need to go into the file comparison window (by double-clicking on an entry in the folder comparison window) which will show groups of differences (lines in the files). In this window, you can move stuff between left and right any way you want, using the toolbar buttons or keys (Alt-Left, Alt-Right, Alt-Up, Alt-Down).
The simple answer is no - you're almost asking it to read your mind. Instead, WinMerge opens both files up in a full text editor, and it illustrates the discrepancies while you do the copy and pasting.
Late to the party, but I just ran into this problem.
I'm using WinMerge 2.16.18.0. On the Select Files or Folders panel, there is a checkbox under each file/folder section that allows that file/folder to be treated as read-only. I unknowingly had that checkbox set as it is easy to miss.
Related
The refactoring menu in Xcode 9.1 is completely greyed out. I wanted to extract a method from existing swift code and got the following screen:
Do I have to enabled something special to get access to the new refactoring features?
Try cleaning your Xcode. Also try clearing out derived data and restart Xcode.
Clean Build --> (Command-Option-Shift-K)
Delete DerivedData folder in ~/Library/Developer/Xcode/DerivedData
Refactor option hides if you select version editor.
Thanks #paul
I had to change to the Active Schema to the one that matched the Target Membership of the file I was editing.
In other words:
In Project Navigator, select the file you're editing
Show the Inspectors panel on the right
Show the File Inspector
Observe the Target Membership values and set the Active Schema (at the top, by the Build and Stop buttons) to match.
Select text, right click, select Refactor
Observe all the Refactor options are now enabled.
This happened to me too and I could not find anything on it so...
My first post is born.
Mike T. hit on a small portion above (incomplete syntax).
Nothing is wrong. Xcode is amazing! It seems the Refactor/Extract feature is pretty smart. The option is not available if it does not make sense to extract a method.
It may not make sense to extract a method for many reasons. Xcode disables the feature when it encounters them in the selection. A few that I noticed are:
variable declarations
a solitary print statement
continue statements in the selection but I don't include the for loop container. (i'm impressed)
my guess is that there are a bunch of conditions...
Small thing for me was that the code I was trying to access was inside a closure so when I was selecting it and right clicking to Extract to a Method, it was greyed out. removing self on both instances, I could then select both lines to then extract to method
self?.activityIndicator.stopAnimating()
self?.activityIndicator.removeFromSuperview()
Both lines were inside a closure for a UIAlertAction. So removing self allows you to extract to a method in this case. Then just call self on the extracted method inside the closure and it should work.
self?.hideSpinner() //extracted method name
As other posters have already said, its best to make sure you're able to refactor what you want by selecting the right code.
Very often I work with multiple projects in MATLAB and have a group of files for each project that I access at one time. Having all files of all projects open causes a lot of clutter in the workspace. One can do this for one single set of files by docking which is well known.
Is there a way to tab projects, or have multiple MATLAB editors (for each project) open with multiple tabs in each (with the projects files). The question can be found here too. In the same vein, are there other code editors which can be used to perform the same?
Project1
file 1.m
file 2.m
file 3.m
file 4.m
Project2
file 1.m
file 2.m
file 3.m
file 4.m
Either in the same window, or in different windows.
Unfortunately I don't believe MATLAB can do that kind of project/file management for you, which is why I use Sublime Text 2. It's perfect for that kind of project/file management... and not to mention the awesome shortcuts and quick editing tools to help you code faster.
Check them out: http://www.sublimetext.com/. The one drawback is that it's nagware. It is free to use, provided you can bare the popups to buy a copy of the software every now and then. Once you buy it, the popups go away. Give it a try and see how it goes!
If someone still need a solution for that-
You can just drag a tab of one file to the side, or bottom of the space of the editor, like that:
And the result will be:
Now you can drag in the same way other tabs to the new tabs group, and you have two separate tabs groups (but one Editor window..). You can of course drag the middle edge line to the right-end, and work fully only with the first group, or drag it to the left-end and work fully with the second one.
Note for one drawback here- if the line is in one of the ends, you don't see the tabs status and files names of the hidden group, and if you forget that you opened some file there and try to open it again, you will not see it opened, or any change in the IDE, because the control goes to the already opened tab but you not see it.
After mild frustration with the difficulty to make top-level "plain old folders" within Eclipse for visual-organization purposes, I discovered that the thing I'm after is called a "working set". Hooray! But they don't seem to be rename-able, by any of the apparent avenues (right-clicking on it or using the Configure Working Sets window).
Is that just the way things are, since no one should be so lazy as to refuse making a new working set with the right name and transferring everything over? Or am I missing something obvious?
I also have a more minor question whose answer I already think I know. Can I tell a specific working set not to change its icon to have the "red X" when one of its children has an error? Nothing in the preferences under Debugging suggests to me the ability to turn off the automatic icon-changing. It's a useful feature, but I have a few simple practice projects with very basic errors, and I don't need the visual reminder to "fix" them, especially if they're in my "Practice" working set, whose icon I'd prefer not to change.
To rename a Working Set, you need to get to the dialogue of selecting a Working Set (click on the white down arrow at the top right of the package explorer > Configure Working Sets..), focus on your Working Set and click the "Edit" button. There, you can change the Working Set's name, as well as what's actually included in the Working Set.
There is no way (that I know of) to change the icon display to avoid showing the errors marker.
Normally Eclipse 'File Compare' compares files in vertical panels like:
Is there a way I can compare them horizontally like:
Compare using Horizontal Panel http://www.sqlservertool.com/images/ad_hex_diff_small.gif
Its too tiring to scroll everytime to see what was changed!!
Thx
Looking at the code of org.eclipse.comparator.internal.CompareEditor (which is the name of the class of the editor illustrated in your question), I do not see any indication of a different "orientation" (horizontal layout vs. vertical layout)
So, no. I do not think the current implementation allows you to compare files with a different layout.
I'm afraid VonC is right that the current implementation doesn't support changing the layout, but there is a bug open for it so you can either provide a patch or ping guys from Eclipse Workspace Team (including me :) and ask them to fix it for you ;)
I guess Robert was referring to Select Next/Previous Change/Difference buttons (see section Toolbar in Eclipse Help).
If your problem is scrolling, use the toolbar buttons to navigate between changes.
One way to overcome your problem is to Maximize editor window during file compare, and then Restore it after compares are done. I wish Eclipse did it by default.
As to the question of orientation. I think it's more readable when you compare revisions side-by-side. That's probably why Eclipse authors did not give us an option of horizontal layout. What they could have given us were a line diff at the current cursor position.
Is anyone aware of any method (or external plugin) that would allow for nested editor tabs? It would be nice to be able to group related open files into their own "master" tabs, but I'm not sure if this is even possible. Any ideas?
This is totally non-obvious, and I discovered it by accident, but...
If you click on a tab and start dragging it downwards, once you get more than half-way down the editor pane, a horizontal line will appear. Let go, and now you'll have two different editor panes, each with tabs of documents. Now you can drag tabs up and down between the two panes to see different documents at the same time.
I think that's as close as you can get.
I think the best you can currently do is "Window->New Window" and then use each new window as a separate "tab" of related editors. Not exactly ideal, I admit.
It's a cool idea though, especially if you could have shortcuts or something that open groups of editors with a single command.
This definitely isn't possible in the current RCP. You might be able to construct an editor component which created a CTabFolder and delegated to other editor components, but I'm not sure how well that would work.
There are Perspectives in Eclipse that you might use to achieve something close, they are more global things though...
But I agree with you, I would like this feature as well! This would be also very useful when editing many files that have the same name but come from different packages, because now it's a mess >_<
For me the utility of such a feature is to reduce context switching time. I'm working on project A, have lots of editors open, now I need to drop that and work on project B. I want to keep all the editors open associated with project A but hide them while I work on B. When I'm done with B, I can pick up right where I left off in A without having to find and open all those A files again; I can even leave them unsaved indefinitely, since Juno never crashes!! :)
I have used the New Window feature, and it's great, but the new window needs a bunch of configuration (closing Views I don't need, moving stuff around to where I want it, opening Views I had open in the old window, and so on) before I can get to work. It also uses a lot more memory than a simple tab group would since it seems to be a complete new copy of Eclipse.
The split-window feature is great and I use it all the time. It is indeed tab groups, and if there were a way to hide a tab group, and for each tab group to have its own tab list (the thing you get when you click ">>5" so you can see editors you have open that don't fit in the tab header), it would totally fill the bill.