On Fri, Nov 17, 2023 at 10:39:41PM +0100, Uwe Brauer wrote: [...] > while as I learned right now, > git is more relaxed about it, > so I could proceed with other commands and git did not complain really. [...] > Ok, so no > git resolve --options > command > > but the add command takes care of it, thanks > > Personal remark. For me in some sense git is more restrictive (you > cannot disable the index for example) but in some sense, as in the merge > example it is less.
I think that's an artefact of how Git was created: it hasn't been designed in an "UI-first"/"UX-first" fashion; instead, it grew organically (or, one could say haphazardly) around the low-level tooling. That, in turn, was - I suppose - an artefact of the need to get it working ASAP and its intended audience being people who routinely write kernel drivers ;-) That approach assumed that the user reads up a couple manual pages to build a mental model of how the thing works and then applies it when running various (pretty much low-level) commands. I do not advocate this approach (though neither I oppose it: I, for one, never felt Mercurial's UI model is more logical than that of Git), just trying to explain why the things are what they are - pretty much for amusement purposes. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/20231121124247.ilyaupgbywlqnrja%40carbon.
