Added "helper" text to actual code files.

[maczkowski-bartlomiej]

Version

0.19.3

Operating System

Windows

Distribution Method

msi (Windows)

Describe the issue

I dont know what happened but it added an actual text to actual code files over entire branch.
The text like:

|||||||| acenstor
=================
>>>>>>>>>>>>>> theirs

etc.

I want to have only code code that is <<<<<<< ours since this is the newest code.
They are very old changes and commits which are mixed with added text. Tens of files are affected in my project. No idea what to do??? And I can't revert since actual changes would be lost

How to reproduce (Optional)

No response

Expected behavior (Optional)

No response

Relevant log output (Optional)

[Byron]

Thanks for reporting, and sorry for the hassle.

I know of one way these conflict markers are added to files without marking the files as conflicted in the index, but maybe there are more:

1. edit a commit using the respective feature in the GUI while there is uncommitted files
2. edit the files that had uncommitted changes in the worktree before in conflicting ways
3. accept the changes in edit mode

Now the conflicts are in the worktree, but not in the Git index, which makes them appear like these are genuine changes that you can commit freely.

This is due to the way the worktree is checked out, and it's one of the few places where we still use git2 in 'unsafe' ways. CC @Caleb-T-Owens.

As for how you can fix this, I believe the only way is to fix it by hand and choose the side you think is desirable here. Additionally, such a commit should not have passed any kind of test, such files wouldn't compile, and maybe this is also something to work on.