> On Fri, Nov 17, 2023 at 03:11:29PM +0100, Uwe Brauer wrote: > [...]
> I'm afraid this situation might be not as straightforward as you think. > The message > should be interpreted literally: Git did not even attempted a merge operation > because you have unmerged files in the index (and work tree). > (When there's a conflict during a merge, Git says exactly that, for each file > with the conflict(s).) > Quite possibly, you're in a state of a past attempted merge operation which > failed. > I would recommend to run > git merge --abort Ah, oops, right. I forgot! Thing is: that is needed in mercurial as well, however it is absolutely mandatory that is all other operations are basically blocked till you run hg merge --abort 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. Thanks for clarifying > to revert the things to the pre-merge state (pre-*that*-merge state, that is) > and then try to run > git merge $commit > again, and see. > As to resolving the conflicts, these days Git prominently hints at > what to do in the output it produces when you run `git status`. Since > in Git, a commit is created from the state constructed in the staging > area (or "the index", as it was called in the olden days), after > resolving conflicts in a file, you `git add` that file - "stage" its > changes, and its automatically marked as resolved. 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 strongly condemn Hamas heinous atrocities on Israel, especially the despicable pogroms. I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. -- 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/87bkbsxdnm.fsf%40mat.ucm.es.
smime.p7s
Description: S/MIME cryptographic signature
