What is Reddit's opinion of Meld?

From 3.5 billion Reddit comments

I moved to lazygit (and I have mapping to open lazygit in floaterm) and for merge conflicts I usually just use meld, as is little more visual and easy to use.

I tend to do almost everything in neovim, but I leave few things to external applications as I find those much faster to use. Still missing jetbrains merge tool, but meld is "close enough".

I'm going little different route myself. For some tools I prefer something outside of vim as sometimes outside tools works better/faster.

So for git I use Lazygit inside floaterm.

I have <leader>tg (Terminal Git) on my keybindings (it just runs :FloatermNew lazygit) so I can quickly open that when needed.

It's fast and works well. And for rare merge conflicts I usually just use meld as I like to have GUI for that.

If you have a copy of your old config.plist, you could use a text comparison program to see what changed. I think Xcode has one built in; I personally use Meld.

My guess is that your drivers simply weren't enabled.

Meld link um Dokumente etc zu vergleichen.

Sublime text. link bester Editor (subjektiv). Man kann mehre Zeilen gleichzeitig bearbeiten. Riesen community und ein Haufen plug-ins. Lässt sich sehr gut auf die eigenen Bedürfnisse anpassen.

Weiter ohne links:

Microsoft One note, schnelle Notizen sauber als pdf verschicken, und natürlich excel :)

And works well with floaterm.

I've been using this for couple years now and I use this all the time inside Neovim.

Pull/Push/Commit/Merging and creating/removing/changing branches works extremely well.

For merge conflicts I tend to use GUI tool called meld.

In general I would use a tool like Meld or similar, but it needs two files to compare so idk how/if it would work with Obsidian Sync (which I've never used).

If you don't get good answers on reddit you might also want to ask on the official forum.

Goto tool git for me has been Lazygit.

I have binding <leader>tg (<space> Terminal Git) which opens Lazygit in floating terminal inside my neovim (should work also on vim).

It's easy and quick to pull/push/add/revert/commit/cherry-pick commits and change/create/merge branches with lazygit.

For merge conflicts I use Meld as I haven't found anything better yet (for merging I prefer GUI tool, as it happens very rarely and it makes it little easier).

I go little different route which I find little easier (and faster for me).

First I use Lazygit. I tried to use everything via vim at first, but figured out that it's OK to use external tools if they help with your workflow.

And most of the time I commit everything, so my workflow for that is:

<leader>tg #open lazygit on floating window a #add all to commit c #create commit <write commit message> <CR> P #push changes q # exit lazygit/floating window

&nbsp;

I can usually do this pretty quickly. Lazygit also allows selecting files to be staged (and IIRC you can even select certain changes on files). And I use that to change branch if I'm inside vim already.

Huge downside (for someone) is that you need to install Lazygit and use that. You cannot do that on every machine. But I also have heavily configured vim to suit my workflow better, so that needs extra installations at first anyway..

I merge via terminal and for rare merge conflicts I usually open Meld nowadays as it's much simpler to use compared what vim offers (I do those so rarely that I like some GUI when I'm doing that).

Only thing I would like to have from my old jetbrains IDE was git tools. They were excellent to use. But since I fully changed to (neo)vim ~year ago, I don't miss anything else currently.

tmux+vim is much faster for my workflow noways compared to jetbrains

Can't say without your file. From what I remember (it was a while ago), I had to change the direction of the motors.

Use a text editor program that can make file comparison, that way you can find the changes yourself. For that I use Meld on Linux, and Notepad++ & the file comparison plugin on Windows.

> I would use git to store both the disassembly and your code to modify it.

Yep, it's in a git repo.

Since I'm working backwards from a known-good binary, my Makefile has a hash value stored in it as constant. Every time I re-build, my Makfile automatically checks the hash. If the hash fails to match, I know that something went wrong.

I've been using xxd and awk to get byte dumps for comparison with Meld. Normally, I don't like GUI-based tools for development, but I would never have gotten this far just plain diff. I've come to like Meld.

I haven't quite gotten around to setting up my Makefile to auto-generate .xxd dumps of the bad build and the known-good binary for comparison, but I'll be doing so soon. Right now I just do it manually.

> Note that Rakudo currently has no built-in feature to do inplace editing like an -i command line switch.

Nuts. Ah, well. No biggie.

Pretty much any time there's a merge conflict -- left one is the current state in the repo, right one is my version, middle is the common base, sometimes with the auto-mergeable diffs already merged in. I can easily merge changes from the left or right (depending which I want to keep), or manually type when a particularly hairy edit is needed.

See, for example, https://meldmerge.org/ -- in particular, this picture.

It's not strictly needed, but even in that example, I hope you can see the potential: It's not just "Do you want 'Hello, world' or do you want 'HELLO', or do you want to type 'HELLO WORLD'?" It's also: "What were they actually changing in the repo that caused this conflict in the first place?" In this case, someone apparently wanted to make the message louder, so maybe I should preserve that intent and go for 'HELLO WORLD'.

It's not difficult to set up, either. If you use Git on Linux, this could be as easy as adding this config file and typing sudo apt install meld (or whatever works for your distro).

These days, I use a different VCS and there's a decent tool built into my IDE... but it's a common, useful pattern.

A couple of non xml specific diff programs are P4 Merge on Windows and Meld which is cross platform.

"diff" is a common term in software development, referring to the difference between two files.

Often, when merging your source code changes into the main repository, you perform a diff to see what has changed. Or you can perform a diff between any two versions to see what has changed in a previous revision.

Meld is an application used to graphically show "diffs".

Since removing old portions of #ifdef blocks is a common operation there are tools that simplify the process. I haven't tried this and you shouldn't trust it until you have tested it and used tools like meld to quickly check changes.

https://dotat.at/prog/unifdef/

"unifdef" is used by the Linux kernel developers, if that helps.

I would start by seeing how well your favorite diff program works to compare the transcripts. If you don't already have a favorite, try meld.

Most diff programs use the Myers diff algorithm. If you are trying to automate something, I imagine there are libraries available in every language that implement this algorithm. Or if you are just trying to learn, it might be fun to try to implement yourself.

No idea about an extension, I just always use Meld (https://meldmerge.org/). Just select "File comparison" -> "Blank comparison". Meld is cross-platform, open-source, and I love it.