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
On Fri, Nov 17, 2023 at 03:11:29PM +0100, Uwe Brauer wrote:
[...]
> 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 '
> | hint: as appropriate to m
> 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
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
