timofeysie
commented
4 years ago I created the sw branch from the feature#12 branch by mistake instead of dev. Then @dhananjaya90 asked to soft reset the #12 branch and commit his finished work for #12. He said then I have to rebase into #12 the sw branch. That's what has caused this message from git, in case anyone else comes across this message.
$ git pull error: Pull 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 mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.