On branch my_branch
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
modified: folder1/controllers/main.py
modified: folder2/models/const.py
modified: folder3/report/file1.xml
modified: folder4/report/file2.xml
modified: folder5/report/file3.xml
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: folder/file.py
Untracked files:
(use "git add <file>..." to include in what will be committed)
../.bash_logout
../.bashrc
../.profile
../docker/folder6/docker-compose.yaml.save
../docker/folder7/repos.yaml.save