git-imerge
SemanticDiff
git-imerge | SemanticDiff | |
---|---|---|
12 | 13 | |
2,665 | 38 | |
- | - | |
0.0 | 2.9 | |
12 months ago | 6 months ago | |
Python | ||
GNU General Public License v3.0 only | - |
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.
git-imerge
- Dealing with Diverged Git Branches
- Pijul: Version-Control Post-Git • Goto 2023
-
Save rebase progress and attempt to cherry-pick?
Afaik, there's currently no official way to pause/stash a rebase/merge-in-progress. (There is git-imerge which supports incremental merges/rebases (basically split a big merge into smaller ones), but I never used it and think you'll need to use it from the start of a merge/rebase.)
-
I have a feature branch that is now way behind it's remote parent. How do I make this work?
Try git imerge.
-
What is the best way to undertake a heavyweight merge (dozens of files)?
If the merge is large in the number of commits involved git imerge may be useful to you. It breaks down one big merge into many smaller merges, essentially merging one new commit from each branch, one at a time. The advantage being that you only ever need to consider the conflict between two individual commits at a time.
- Git-imerge: Incremental merge for Git
-
strategy to update 2yo feature branch off of develop
The repo for it is https://github.com/mhagger/git-imerge and the blog post / instructions is at https://wilsonmar.github.io/git-imerge/
- interactive merge in git
-
Jujutsu – A Git-compatible DVCS that is both simple and powerful
Similar ideas have been discussed before in Git, but I don't think anyone has acted on them much. Michael Haggerty's git-imerge tries to make conflicts shareable, but I think it was more of a side-effect of the original goal of optimizing rebase/merge and auto-reducing conflicts to their minimal representation. I'm very curious how conflicts are represented in Jujutsu so I can better understand this power. I'm curious about how conflicts in conflict-resolution commits are handled and other such magic.
That gist seems like a simplified version of https://github.com/mhagger/git-imerge, so check that out if you haven't. (I haven't looked at git-imerge in a long time, so I should read about it again myself.)
SemanticDiff
-
Difftastic, a structural diff tool that understands syntax
Semantic Diff is probably the closest for now, although I don't think it uses tree-sitter.
https://semanticdiff.com/
Found via https://github.com/Wilfred/difftastic/issues/194.
-
My programming language aware diff for VS Code and GitHub now supports Rust
I am working on SemanticDiff, a programming language aware diff that hides style-only changes, detects moved code and refactorings. I just added support for Rust and would like to know what you think!
-
Prettier $20k Bounty was Claimed
If you're looking for a VS Code extension or a GitHub app, check out https://semanticdiff.com/. I'm a co-founder of this project.
If you prefer a CLI tool, check out https://github.com/Wilfred/difftastic. It supports more languages, but doesn't recognize when code has been replaced by an equivalent version ("invariances"). So it will show some changes (e.g. replacing a character in a string with an escape sequence) even though they are technically equivalent.
-
Large pull requests slow down development
There are some tools that can separate actual code changes from reformatting changes. I am working on https://semanticdiff.com, a VS Code Extension / GitHub App that can help you with this. There is also difftastic if you prefer a CLI based solution. It supports more languages but can detect fewer types of reformatting changes.
-
Pijul: Version-Control Post-Git • Goto 2023
I'm not familiar with Pijul, and haven't finished watching this presentation, but IME the problems with modern version control tools is that they still rely on comparing lines of plain text, something we've been doing for decades. Merge conflicts are an issue because our tools are agnostic about the actual content they're tracking.
Instead, the tools should be smarter and work on the level of functions, classes, packages, sentences, paragraphs, or whatever primitive makes sense for the project and file that is being changed. In the case of code bases, they need to be aware of the language and the AST of the program. For binary files, they need to be aware of the file format and its binary structure. This would allow them to show actually meaningful diffs, and minimize the chances of conflicts, and of producing a corrupt file after an automatic merge.
There has been some research in this area, and there are a few semantic diffing tools[1,2,3], but I'm not aware of this being widely used in any VCS.
Nowadays, with all the machine learning advances, the ideal VCS should also use ML to understand the change at a deeper level, and maybe even suggest improvements. If AI can write code for me, it could surely understand what I'm trying to do, and help me so that version control is entirely hands-free, instead of having to fight with it, and be constantly aware of it, as I have to do now.
I just finished watching the presentation, and Pijul seems like an iterative improvement over Git. Nothing jumped out at me like a killer feature that would make me want to give it a try. It might be because the author focuses too much on technical details, instead of taking a step back and rethinking what a modern VCS tool should look like today.
[1]: https://semanticdiff.com/
[2]: https://github.com/trailofbits/graphtage
[3]: https://github.com/GumTreeDiff/gumtree
-
I added Go support to my VS Code extension for programming language aware diffs
You mean copying chunks from one file/side to the other? If that is the case, you might want to subscribe to this issue that was opened a few days ago. Since the extension does not work on a line-by-line level, it is a bit more difficult than for normal diffs. For example, what should happen if the formatting differs between both files. Should SemanticDiff copy it over as well or try to merge the changes? I will try to post an update on/in this issue soon and maybe have a discussion about the expected behavior.
- SemanticDiff – Language Aware Diff for VS Code
-
My Visual Studio Code extension for programming language aware diffs is now in public beta!
Feel free to open an issue at https://github.com/Sysmagine/SemanticDiff/issues so that we can keep you updated on the progress.
-
Searching for beta testers for my VS Code extension that makes diffs more readable
Feel free to open feature requests for any languages you need: https://github.com/Sysmagine/SemanticDiff/issues
What are some alternatives?
jj - A Git-compatible VCS that is both simple and powerful
mergify - Merge git changes on commit at a time.
elasticsearch-py - Official Python client for Elasticsearch
git-machete - Probably the sharpest git repository organizer & rebase/merge workflow automation tool you've ever seen
git-mergify-rebase - Merge git changes one commit at a time.
vscode-settings - My VS Code settings and extensions
pg_similarity - set of functions and operators for executing similarity queries
graphtage - A semantic diff utility and library for tree-like files such as JSON, JSON5, XML, HTML, YAML, and CSV.
gumtree - An awesome code differencing tool
difftastic - a structural diff that understands syntax 🟥🟩
git-stack - Stacked branch management for Git