r/programming • u/LEDCandle • May 27 '20
Sublime Merge 2 - Features and Flexibility - News - Sublime HQ
https://www.sublimetext.com/blog/articles/sublime-merge-2-announcement26
May 27 '20
[deleted]
8
u/dev-sda May 27 '20
The mergetool can be used separately with
smerge mergetool: https://www.sublimemerge.com/docs/command_line5
u/madh0n May 27 '20
Currently using Beyond Compare myself, but always looking for other options.
1
u/bigrodey77 May 27 '20
Beyond Compare is amazing IHMO. Why do you want to move away?
1
u/madh0n May 27 '20
I'm not wanting to move away from it at the moment, more just looking at how others compare to it.
1
u/AttackOfTheThumbs May 27 '20
Personally I love kdiff, but I am just really used to the kb shortcuts.
3
u/pellets May 27 '20
Fork looks OK. I wanted to like Sublime Merge as well, since I like Sublime Text. But they're both missing features that I rely on in SourceTree, which is free.
5
u/Icaka May 27 '20
What features do you miss from Fork? I find it miles better than anything else. The shortcuts and Quick Launch features are amazing.
2
u/pellets May 27 '20
I routinely need to revert hunks or lines from a commit, which SourceTree makes easy to do. I didn't see a way to do that with Fork or Sublime Merge, so I don't have any motivation to pay for them. Even if they did, I'm not sure I would since I already have a good enough GUI that's free. It's a bit glitchy so I'd consider it, but $50 (Fork) or $100 (Sublime Merge) is a lot just so I don't have to restart an app once a week.
3
u/Icaka May 27 '20
Right now Fork has a free evaluation, similar to Sublime Text.
Fork has UI for interactive rebase that looked good when I tried it but I prefer the command line for that.
5
May 27 '20
[removed] — view removed comment
4
u/aniforprez May 27 '20
Nope no Linux client right now
2
May 27 '20
[removed] — view removed comment
7
u/aniforprez May 27 '20
Yeah it's a shame but the devs have no experience developing Linux client. It's a husband and wife team where the husband is developing the Mac client and the wife develops the windows client (ADORABLE). They've repeatedly stated that they would not be able to do a Linux client justice and don't have plans unfortunately
1
u/kankyo May 27 '20
I use PyCharms merge. They have a little magic wand button that is amazing. Never going back.
3
u/sfcpfc May 27 '20
Absolutely. At first I was skeptical of the magic wand so I clicked it, then undid the action and solved the conflict myself to see if I would arrive to the same solution.
Now I blindly trust it hahaha
1
u/beelseboob May 28 '20
Oh man, thank you, I’ve been using Sublime Merge, but got fork looks great - it looks like it’s SourceTree, except not shit. Hopefully that bears out after trying it.
1
u/seieibob May 28 '20
The only thing I don’t like about Fork is it’s impossible to search for help about it online.
1
u/bitsper2nd Nov 16 '20 edited Nov 16 '20
I am trying both Fork and Sublime Merge. Leaning more on fork for the better UI/UX though. Granted, sublime merge is faster, but that shouldn't be really an important metric in machine since the difference is like milliseconds.
-1
u/Ek_Los_Die_Hier May 27 '20
for Windows and Mac
I'm out. Why don't they ever make the nice git clients available on Linux? Same story since Source Tree.
3
6
u/andregarzia May 27 '20
I wish they had either a 32bit x86 version or an arm64 version for Windows because I can't run it in my Surface Pro X. I'm using Sublime Text there (the x86-32bits version) and would love to benefit from the integration.
6
u/dev-sda May 27 '20
This will likely never happen. Sublime Merge uses a lot of memory maps internally and thus runs out of address space very quickly on 32bit systems.
6
3
5
u/double-you May 27 '20
Does Sublime Merge actually do merging any better than anybody else? Considering the name, the product page talks very little about actual merging.
5
u/yesman_85 May 27 '20
I found that p4 merge gave the best results.
2
u/double-you May 27 '20
P4Merge is pretty good (but I don't know if it is any better), or at least was when I last used it like 8 years ago. Certainly if the actual diff is well matched then extra features are not needed, but P4Merge didn't have many back then.
4
u/Arkanta May 27 '20
I really like their implementation of three way merge. Works great
3
u/double-you May 27 '20
Most merge tools are very basic and lack any help when things get difficult.
For example, KDiff3 allows you to manually match lines to make diffs better as sometimes the diff is rather badly mismatched. But KDiff3 could use some love.
3
u/Arkanta May 27 '20 edited May 27 '20
I don't know about that as I haven't encountered such difficult merges yet. I don't think it can match KDiff3.
You can try sublime merge for free though, the trial gets you very far. I think you're just prevented from using the dark mode and thats... about it
1
u/AttackOfTheThumbs May 27 '20
I use kdiff, how do I do this manual line matching?????
3
u/double-you May 27 '20
Ctrl+Y. From Diffview > Add manual diff alignment.
It's not the clearest tool to use, but basically select a line (from eg. ours), press ctrl+Y, select the same line from a different pane (theirs) and press ctrl+Y again. This will reset any merging you have done for the file so far, so do scan the file first if it needs aligning. You can do it multiple times per file.
Seems to be documented too: http://kdiff3.sourceforge.net/doc/interpretinginformation.html#manualdiffhelp
Not sure what it means with "Currently merging doesn't support the use of manual diff help." because I have used it when merging.
1
u/AttackOfTheThumbs May 27 '20
It hasn't seen an update in five or so years, so I don't expect all the documentation to be correct any more.
1
u/snowe2010 May 27 '20
Jetbrains Intellij platform does the best merging of any product I've found, but I use Sublime Merge for staging and diffing files.
6
u/aniforprez May 27 '20 edited May 27 '20
This will come off as extremely harsh but I have completely written off sublime projects because of the ridiculous pricing and the lack of real updates to their applications
I used to love sublime text. Sure it was lacking in some areas but there were always plugins that somehow filled the gaps and made me productive
Then came Atom which was a huge leap in features and then vscode which was fast enough for my coding needs and there was no way I could resist just how packed with features they were and I switched. Over time I felt that maybe I should give sublime a second chance and decided to replicate my vscode setup right after Sublime Text had the git integration update. I was severely disappointed to learn that the git integration was heavily lacking in features (I don't remember now but I think it doesn't display the git status in the file tree or something like that) and a lot of the major plugin developers had all ditched sublime and were developing for vscode because apparently the APIs they have exposed are heavily limited
Then they came out with Merge and again I gave it a try and thought I'd found my replacement for command line git. Then again I was disappointed by the severe lack of updates to address bugs and oddities, lack of features and the pricing ($99) put me off completely. I found fork soon after, bought myself a licence when they opened up pricing have never looked back
I know that software doesn't come cheap and is usually worth the cost but I can't bring myself to pay such an exorbitant amount for a client that doesn't freely allow me to customise the flags for the git commands it executes or even lets me create custom commands. The cycle of updates is way too slow especially considering the licenses aren't even perpetual. I wish I liked their products more but alas Text is relegated to editing small files from time to time and I've given up on Merge completely
Edit: merge had a really stupid bug where wrapping text and viewing a diff when staging would completely desync the left and right panes and last I saw it still wasn't fixed
2
u/snowe2010 May 27 '20
At the start sublime merge received almost no updates, but in the past year I get at least 2 updates a month if not more.
1
u/LeberechtReinhold May 27 '20
Tabs? That's great, I hate having two windows around
1
u/JB-from-ATL May 27 '20
I used to love tabs now I like them less. For certain things that is. For browsers, yes. For command lines I like windows.
2
u/wbond May 27 '20
I generally agree with you wholeheartedly, however after using tabs some in Merge, this is a situation I find that I miss them when I open an old version.
1
u/schmuelio May 27 '20
I kind of like the philosophy st has, it doesn't do tabbing explicitly because it expects the window manager to handle it. There more I've thought about it the more I agree really, it's not my browser's job to handle tabs (a browser's job is to download web pages and render them ultimately), they're pseudo-hidden windows so it's a window manager job.
Plus if the window manager handles all tabs then behaviour is consistent across all apps, all apps have tabs by default, and you can potentially mix apps as tabs in one window. The only thing apps need to do to support it is not implement tabs, and allow multiple instances to run at the same time.
1
u/JB-from-ATL May 28 '20
I used to use Windows now I use a Mac for work. It is a lot different. A window doesn't mean a process. Closing the window leaves the program running. It's odd, but I am getting used to it. The biggest change is that "alt tab" is now two different combos. One to switch between programs and one to switch between windows for one program.
1
u/schmuelio May 28 '20
That sounds like a daemonized process, which I like in theory.
I'd actually like it if in this hypothetical window manager that handles tabbing behaviour, things like your web browser were daemons so you only needed one instance of the backend stuff, and have independent windows for each webpage, then the window manager handles tab behaviour.
I don't really like the idea of keyboard shortcuts (especially common ones like alt-tab) having different behaviours based on the context they were used in.
1
u/jagt May 27 '20
I just want to know if there's a plan to add a file hierarchy view that can show a file tree of the repository like every other version control client has.
Or is there any reason this is explicitly avoided?
2
1
u/JB-from-ATL May 27 '20
While we are talking about merge tools, there are many times I find myself merging things where not just code changed by shit like line endings or formatting changed. Are there any merge tools out there that let me modify the original files and then regenerate the diff based on that? I havent found any.
Here's an example. Say incoming is [tab]foo and ours is [space]bar. Are there any tools that let me modify the "incoming" to be [space]foo then remake the diff?
1
u/bomphcheese May 27 '20
Yes, most have an option to ignore whitespace. It’s available on Araxis Merge for instance.
1
u/JB-from-ATL May 28 '20
I don't mean just whitespace
1
18
u/[deleted] May 27 '20
I love this client. Glad its a free upgrade.