Si existe un programa minimalista y libre para hacer merges de código ese es el #Meld merge.

https://meldmerge.org/

Meld

have used, & enjoyed, #kdiff3 as my default graphical diff app in all my various distros, having first discovered it in my default boot, :archlinux: :kde: , years ago. it has been quite an up & down ride though, coz when it works it's excellent, but over the long haul it has broken many times, partly or completely. for the past week or two it's been pissing me off again. though it launches, both standalone & when invoked from #Dolphin, as soon as i click the icon to begin the manual diffing, its GUI freezes & has to be closed. trying several recent versions via downgrade hasn't helped, & reverting its config file to default also hasn't. i've finally lost all patience with it, so have removed it, & now my default diff app is #Meld... which is a pity given it's GTK. i still have #Kompare installed, but only use it for simple things, given it is barely configurable & flexible compared to the other two. sassen frassen rassen.

#DropbearPooterising #Linux #LinuxWomen #FOSS
:archlinux: :kde: #ArchLinux #KDEPlasma :linuxfedora: #Kinoite
:linuxdebian: #SparkyLinux :linuxopensuse: #Kalpa :kde: :linux: #KDELinux
:firefoxnightly: #FirefoxNightly #FirefoxSecondSidebar #TreeStyleTab

`jj new` feels like it will take some getting used to, I'm not convinced the Git integration is *quite* there yet, and I really want to name individual commits. I think you can kinda solve that last one with bookmarks, but it's clearly not the intended use of them.

I wasn't able to get the diff editor working with #Meld, which is a shame because moving content between commits is an area I frequently struggle with and feel there's better UX opportunities out there. Hopefully I can get that working at some point in the future.

https://jj-vcs.github.io/jj/latest/tutorial/#moving-content-changes-between-commits

Tutorial and bird's eye view - Jujutsu docs

I thought I was going to spend ages getting everything set up using
Meld Studio
(getting ready for December) thinking it would take that long to set up (it does using OBS)
2 clicks and Meld has copied my latest OBS scenes into it
one word Epic
Thank you #meld

VVOMB, MELD & ØBELISK at batimant 7!!

Batiment 7, Sunday, September 28 at 07:30 AM EDT

Dope show with

Vvomb

https://www.instagram.com/vvombbandmtl?igsh=MTNqMGZibW1heXMydw==

Øbelisk

https://www.instagram.com/o__b__e__l__i__s__k?igsh=YnNoM2c1ZXJkeXZt

Meld

https://www.instagram.com/meld_the_band?igsh=MTR4Y3Y0OG0wZ2tpbQ==

On Sunday September 28th at 7:30

All ages

15$ at the door

Be there!!!

https://montreal.askapunk.net/event/vvomb-meld-and-obelisk-at-batimant-7

@smxi @eht16 Before using #kate I was using #geany and was happy with it; but I didn't used it from years now, from my memory the functions that made me switch to Kate was the ability to get multiple documents opened in different panes (I most of time have 2 to 3 panes to be able to get what I need under my eyes) and session manager

One thing I need to take care about is also, Geany was written in GTK if remember and with GTK4, there's no "classic" menu anymore, but a thing with some buttons and a hamburger menu on the right side. I stopped to use #meld and many other gtk based softwares because without classic menu I'm just lost.

So did Geany have (or will have) the same problem? Because I don't want to switch on a GTK software if in few months I'll have to search a new one again 

Meld Studio - Die OBS / Ecamm Live Alternative?

https://video.maechler.cloud/w/fJDwshCDaUragJYrF9mBVL

Meld Studio - Die OBS / Ecamm Live Alternative?

PeerTube