meld VS barrier

Even simpler:

Step 1: give me your edited `.tex` file.

Step 2: I selectively merge it into mine.

Step 3: There is no step 3.

To selectively merge, I use `meld` https://meldmerge.org/ but there are others.

Benefits of this even simpler approach:

- We continue to use the tools we are used to.

- We and our software don't have to learn a new inline diff format.

- Both files retain valid syntax before and during the selective merge.

- I can choose chunks to accept with a simple mouse click instead of editing a diff chunk.

While we're requesting killer features, https://meldmerge.org/ style diffs, please.

Why do you need ChatGPT? There are hundreds of diffing tools available that do this quite well. Meld is my favorite: https://meldmerge.org/

Thanks, just today I daecided that the current status of Meld (https://meldmerge.org/) was untenable for me.

It used to be a fast program, with a reasonable interface.

For a long time now its interface has been "simplifed" following GNOME 3's User Interface Guidelines, and everything ended up being hidden inside a hamburger menu.

But what definitely made it untenable was not the UI, but its tendency to crash and being really slow under the slightest load.

I was considering contributing to the project, but honestly a better engineered alternative would be welcome.

Thanks for the info (and thanks Kai Willadsen for Meld).

I’m looking for recommendations for the best visual diff and merge tool available on macOS. I’ve done my research as below but have some reservations about the options I found. - Meld seems to get mentioned a lot but the website syas it is not officially supported on OS X. Are the third party binaries trustworthy? - Beyond Compare is also mentioned but the developer website doesn’t inspire much confidence.

https://meldmerge.org/ ?

So, I use Meld for viewing complex diffs (:silent !meld . &). For interactivity, of course, I use the terminal and Vim, such as lazygit and tig, and fugative and gitgutter (or equivalents).

You bet. (Just copied the text of both into Meld and looked for genuine differences, in case you'd like to have an easy way for the future.) Thanks for doing all that you do here!

WinMerge would be my recommendation on windows, Meld on everything else

Meld - visual diff and merge tool: compare files, directories, and version controlled projects

For software KVM you can use https://github.com/debauchee/barrier

I use it between a Windows PC & a Macbookpro (Linux version available but I don't have Linux)

libei looks useful. But IDK why libei is necessary to run Barrier with Wayland?

For client systems, couldn't there just be a virtual /dev/inputXYZ that Barrier forwards events through

And for host systems, it looks like xev only logs input events when the window is focused.

Is xeyes still broken on Wayland, and how to fix it so that it would work with Barrier?

With Barrier, when the mouse cursor reaches a screen boundary, the keyboard and mouse input are then passed to a different X session on another box until the cursor again crosses a screen boundary rule.

Barrier is a fork of Synergy's open core: https://github.com/debauchee/barrier

libei:

I have a similar gaming/WFH setup (2 monitors at 1440p 144hz) and I’ve been using Barrier instead of a physical kvm, and it works really well. Not sure if you’re open to a software kvm but if you are, I’m happy to answer any questions about it if you have any.

Have you tried Barrier? I casually used it to swap between my main rig and my MBP. Took a minute to get it setup but once I sorted it all out it worked pretty well. It has some settings and tweaks built in to address some of the layout issues you mentioned...

Barrier appears to handle PC switching only for the keyboard and mouse.

Sorry, probably not entirely on topic and can't answer anything reliable about the multimonitor stuff, but a tip regarding the 2 mice and 2 keyboards for the 2 different computers: use this: https://github.com/debauchee/barrier It's oss multi-os software that lets you use one mouse and keyboard (server) on several PCs (clients) easily over your LAN.

Barrier is a free and open source alternative.