I am trying to use KDiff3 to solve conflicts on windows. But when run the merge I get:
KDiff3: "There is a line end style conflict"
And nothing is merged/solved:
Even though I selected DOS line ending before running the merge:
Any ideas?
It seems to work if I just save instead of pressing the Merge button. That could be a solution.
Here's a screenshot to walk you through the process that Matt Wilkie described in his answer.
Click in the C pane.
Choose an encoding other than 'conflict'
Save
What worked for me:
make the output pane active (click in it),
manually choose both Encoding and Line end style drop down choices,
save (Ctrl + S).
Without doing all three steps, I just kept getting the same error popup. Choosing Use A everwhere and/or related merge menu items had no effect.
Related
I can't find an answer to this anywhere on the web.
In Notepad++ the copy/paste functions do not work NOW! They did before (until now).
The keyboard shortcuts do not work, but here is part of the issue.
On the menu at the top the cut and paste items are grayed out (so do not function there either).
At the shortcut mapper there are no entries for cut and paste (supposed to be at the top but are not anywhere).
These functions work OK in Windows so it is not a Microsoft problem but a Notepad++ problem exclusively.
Tried the following:
Closed all files and the program.
Restarted the program and tried again.
Downloaded the latest version and installed it. Tried again.
Help
Not sure what the real problem is, so bare with me,
First I'd check your bindings are set.
Open Notepad++,
Select "Macro" drop down menu, and click "Modify Shortcut/Delete Macro..."
Navigate to the "Scintilla commands" tab,
Here you can use the filter at the bottom of the window to find specifics,
e.g, "Copy" or "paste" and set your key-bindings.
My Copy is "Ctrl+C or Ctrl+INS" and Paste is "Ctrl+V or Shift+INS" by default.
It's not uncommon for third-party applications/processes to block certain features, also check the directory you installed it to, as sometimes permissions may block features, too.
Hope this helps.
I don't know why this ticket is still open but this was first on my Google list.
My issue was that I had "Set Read-Only" enabled on the "Edit" menu.
I am navigating the code of a big JavaScript library using Sublime Text 3. So I need to open a lot of tabs and switch between them to capture the code co-reference. However, Sublime closes 'unused' tabs automatically for me.
How to disable it? I googled but cannot find a solution. I find a shortcut ctrl+shift+t to restore the most recent closed file, but that is not enough. I need to disable the automatic closing, and that would be better if someone shows me the short key to "display and select a file from all open files". Thanks.
When you single-click on a file in the sidebar, Sublime displays it in a "temp" view that is overwritten the next time you single-click on a file. To open a file in a "permanent" tab that stays open even when other files are opened, you simply need to double-click on the file in the sidebar.
A more direct solution that I find mildly preferable, at least until I can retrain myself to double-click when I want a tab to stay open:
In the Settings, set preview_on_click to false.
This is not quite what I want since it all it does is disable the behavior to open a preview tab on single click -- thereby forcing the user to always double click. But perhaps by working this way for a week or so I will be able to retrain my ingrained assumptions and can go back to the default behavior.
Double click that file on left sidebar you do not want to close automatically.
I am using Sublime Text 3 and every time I press tab it will add an extra tab. My settings are to display tabs as an actual tab (not spaces) and is equivalent to 4 spaces. My issue causes a single tab to therefore create 2 tabs the length of 8 spaces.
For example, if I am trying to indent it will tab twice and I will have to delete one tab.
If I select a block of text it will indent it twice and result in the text being deleted and I have to undo it once to bring the text back.
Also, when using auto complete I normally hit tab to auto complete the first option. It will select the option and do a tab after it. I am not sure if this is an option or setting but its extremely annoying and I have not found a solution yet.
Sublime Text double tabs on tab key press
Sublime Text deletes/removes text on indentation / tab
Both problems are due to a popup (most often the SFTP free version popup for me) hiding in the background. If you make sure to close the popup windows every time they appear you will not get these issues. You could also pay for Sublime or the plugin to remove the popups.
In OSX you can't focus back on Sublime Text without clicking on the popup, so you will never have these problems.
I just had the same issue. I just restarted Sublime and it worked again, no need to reinstall or change any settings.
I just encountered this problem recently, and it appears to only happen on Windows. In my case, the pop-up "Hello! would you like to purchase sublime?" was open in the background, and that caused this issue for me. Once that pop-up is closed, everything works just fine.
Although the question is three months old at the time of writing, this might help people that are still looking for an answer. After having this issue for a while, it annoyed me so much that I traced back the issue.
The double tab issue only happened after a while, so I figured it was triggered by a certain key combination, being pressed wrongly. I've also noticed that the bug only occurred at Windows, not on Linux (Ubuntu).
After disabling all Sublime Text 3 plugins one by one, I've noticed that, for me, SFTP triggered the bug. This happened upon saving, SFTP started uploading, and displayed a evaluation notice. As I've purchased SFTP (and activated it), the double tab bug never occurred again. Even after enabling all other packages, the double tab never troubled again.
This is only one solution to the problem, your problem might originate from something else. Try to disable packages which might cause the problem and try to find the problem that way. It's a lot of work, but might get you the solution.
This solution worked for me on windows:
Just go to
View -> Layout -> Single
Kind of a newbie question.
Sometimes I use the project-wide search feature, and my search results appear listed in the window below, along with the related hierarchy placement.
Let's say I double click a file. It opens. Fine.
However, if I double-click again on another file in the search results window, it will replace the file I just opened. It's impossible for me to open multiple search results, short of manually opening them from the project view.
It wasn't always this way - it worked when I first installed the program, but something changed about three days in and I can't do it anymore.
Thanks!
Go to Preferences > General > Search and uncheck Reuse editors to show matches.
Is there a way to change the color of a tab (in the tab bar) according to the path of the file?
I tried with the PythonScript plugin, but couldn't find a method to change the color of a tab.
I need this because I edit scripts from two environments at the same time, from a LIVE environment, and from a development environment, and I need to be extra careful when editing a LIVE file.
I was looking for a programmatic way to change the color of the tabs, and reviewed the online documentation of Notepad++ but did not find anything about it. So, instead, I propose the following method for your case, it could be helpful to always know which of your files are from the development environment and which from the live environment:
Open a blank instance of Notepad++:
Now start a macro recording: Press Start Recording button on Notepad++ toolbar:
Open a new document
Now you'll have two open blank tabs.
Right click newly open tab and click in option Move to other view from contextual menu
You'll have a window splitted vertically and your two tabs will be displayed next to each other. You'll use these two tabs as separated "containers" for your files
Press Stop Recording button:
Save your just recorded macro:
assign a keyboard shortcut:
Now you can run that recorded macro (from Macro menu, or invoking keyboard shortcut you assigned), every time you want to work on your two environments.
(Optional) Right click vertical separator between "containers" and click Rotate to right
Now your "containers" will be split horizontally and will be displayed one above the other. Personally, I'd recommend you this layout.
Click on the tab at first "container" and from there, open all your "dev" environment files; and analogously open all your "live" environment files from second "container". Note that currently selected container has a more intensely coloured active tab.
If you notice that your working space is small, drag the separator to increase your current "container" size, but I recommend you not to take it completely towards the end, because it will make difficult to differentiate which of the two "containers" you are working on.
Note: If you, mistakenly opened a file of an environment from the wrong "container" you'll always be able to fix that by dragging the tab and dropping it to the other "container":
So you'll always keep control of what files must be on each container.
That's it. I hope this info will be helpful for you.
About changing the color of the tab (not folder specific).
Notepad++ has a file called stylers.xml, located in the roaming folder or in the program folder. It also depends in the installation & windows version. If it does not exists then it is self generated.
At the very end of the file, it says
<WidgetStyle name="Inactive tabs" styleID="0" fgColor="xxxxx" bgColor="xxxxxx" />
And here it is possible to change the color of the inactive tab.
However, it does not work, it is a bug that has been "fixed" countless of times in the past. To the date, the current version 6.2.3 UNICODE, changing the values does nothing.
So far, editing the stylers.xml:
6.2.3 = does nothing
design guideline, gray + gray = not good.
6.2.0 = does nothing
6.1.8 = works.
Nice contrast
6.1 = works.
5.9.8 = works.
5.7 = edit works.
ps: sadly,it is not possible to change the fonts of the tabs.
Wanted to add this as a comment, the button's not there.
You can solve your actual problem by using multiple instances of notepad++, refer this. You can save different sessions and optionally use the "Open File In Solution (OFIS)" plug-in.
I've if you've picked a different Style like 'Black Board', then you will have to change these setting in it's .XML in '/themes', and these setting are found at the bottom of the file.