(no title)
yencabulator | 9 days ago
> On top of that, git is not syntax-aware, so false conflicts are pretty common.
If you have a syntax-aware merge tool, you can tell git to use it. Git does not bundle such for all the languages in the world, or force the user into a specific language (as the author seems to intend to do).
> Fundamentally, git merges are an act of will, they are not deterministic.
They are deterministic, though? It seems author is confused about the fact that humans can add edits on top to resolve conflicts.
> [Part II] With remote branches different from local branches
They're both just refs.
> staging and stash different from commits, plus the worktree
Jj unifies all these while being "just git" underneath (for most users).
> GET //branch2 switching the branch;
GET with side effects?
yencabulator|9 days ago