Hi When I try a merge that turns out to be conflicting mercurial tells me ,---- | hg merge -r 7 | merging test.org | warning: conflicts while merging test.org! (edit, then use 'hg resolve --mark') | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon `----
So I have
1. manually to resolve the conflicts
2. then run hg resolve --mark
3. Then commit
It git I only obtain
,----
| git merge 8b3b5c18a86bc20ee9
| error: Merging is not possible because you have unmerged files.
| hint: Fix them up in the work tree, and then use 'git add/rm <file>'
| hint: as appropriate to mark resolution and make a commit.
| fatal: Exiting because of an unresolved conflict.
`----
So apart from the missing word *conflict* in the message
(which I would have appreciated since it explains better the problem)
it seems only necessary to manually fix the conflicts and then run
git commit -a -m "Merge resolved"
Is this correct?
Thanks
Uwe Brauer
--
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/87r0koxyem.fsf%40mat.ucm.es.
smime.p7s
Description: S/MIME cryptographic signature
