meld
CherryTree
meld | CherryTree | |
---|---|---|
38 | 59 | |
18 | 3,232 | |
- | - | |
4.3 | 9.4 | |
5 months ago | 8 days ago | |
Python | C++ | |
GNU General Public License v3.0 only | GNU General Public License v3.0 or later |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
meld
-
Suggestions: A simple human-readable format for suggesting changes to text files
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.
-
Spacedrive – an open source cross-platform file explorer
While we're requesting killer features, https://meldmerge.org/ style diffs, please.
-
Ask HN: How do you merge two files with ChatGPT(etc.)?
Why do you need ChatGPT? There are hundreds of diffing tools available that do this quite well. Meld is my favorite: https://meldmerge.org/
-
Diaphora, the most advanced Free and Open Source program diffing tool
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).
-
Best visual diff and merge tool on macOS?
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.
-
3 way merge tool as good as IntelliJ?
https://meldmerge.org/ ?
-
Integrating Git and (Neo)Vim: LazyGit + Fugitive + MergeTool for maxiumum efficiency [Showcase]
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).
-
What a surprise
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!
-
Is it possible to compare 2 rpp files?
WinMerge would be my recommendation on windows, Meld on everything else
-
Linux software list. Discussion and advice welcome!
Meld - visual diff and merge tool: compare files, directories, and version controlled projects
CherryTree
- Cherrytree Releases 1.0.0
- Digital notetaking?
-
Personal "database" for storing work experience information?
I am started using CherryTree. (There is a screenshot here.)
-
Ask HN: Using Markdown Files for Notetaking?
I wonder if an extensible editor (example: Atom) could do both of those things with Markdown files. Assuming by styling you mean things like being able to highlight and custom-style some text, even in a typically text-only view of a markdown file. It wouldn't be a big surprise if that could be done...somehow. Collapsible points ought to be doable for sure.
Personally I use other methods for styling within markdown, for example emoji, tags, link formatting with brackets (for things that are not really links), etc.
I also take any list that's longer than 8-10 items and break it up by category or reorganize it so it's less visually overwhelming.
Otherwise you may find it helpful to look into more rich-editor-style notetaking solutions like cherrytree or Notecase Pro. The latter is proprietary but I used it for years and was very happy with it. Good luck in your search.
https://www.giuspen.com/cherrytree/
https://www.notecasepro.com/
- website down
-
Journal Writing App
I'm kinda surprised no one mentioned cherrytree yet.
-
hierarchical note taking applications
cherrytree
-
Best book writing app?
I use FocusWriter. It's a lightweight, full-screen app that does more than enough for a manuscript. I used to use Google Docs with Wavemaker, which has a lot of extra functions like cards and timelines, etc. Docs slowed down a lot with a lot of open windows or really long docs, however. And with WFH the sync isn't that important to me anymore. For notes lately I've been using CheeryTree. All these are free.
-
Share your greatest free tools
CherryTree for a general note-taking database. As an Application Packager I can't remember PowerShell scripts I wrote two weeks ago, so saving my recipes in here is priceless.
-
I've reached 2800 mods. Never do that.
How do you keep track of/document everything? I have been using Cherry Tree. It is a fancy open source note taking program that lets you keep notes in a tree like structure.
What are some alternatives?
kdiff3 - KDiff3 updated for Windows
Trilium Notes - Build your personal knowledge base with Trilium Notes
Visual Studio Code - Visual Studio Code
to-markdown - 🛏 An HTML to Markdown converter written in JavaScript
diffuse - Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.
OSCP-Exam-Report-Template-Markdown - :orange_book: Markdown Templates for Offensive Security OSCP, OSWE, OSCE, OSEE, OSWP exam report
SpotTube
Joplin - Joplin - the secure note taking and to-do app with synchronisation capabilities for Windows, macOS, Linux, Android and iOS.
pornhub - crawl webm and mp4
obsidian-leaflet - Adds interactive maps to Obsidian.md using Leaflet.js
sublime_text - Issue tracker for Sublime Text
public-pentesting-reports - A list of public penetration test reports published by several consulting firms and academic security groups.