The git bash reports for merge conflict but i don't see conflict markers

Hi Samiullah,

The idea behind version control is to avoid situations such as this one, essentially what you've done is created a naming conflict in your local repository because you've already renamed the file on the remote server, instead what you needed to have done is renamed the file locally and pushed that to the remote server.

How to fix it?

Open up a new terminal window or your preferred Git client, next you either want to enter the below command in terminal otherwise in your Git client right click on the conflicted file and revert it back to how it was before it was renamed.

git commit --amend
git reset HEAD filename2.txt
git checkout -- filename2.txt

Don't get scared by these commands, this is what Git clients are doing behind the scenes.

1. git commit --amend reverts the last commit, basically it tells your local repository not to commit any changes
2. git reset HEAD filename2.txt resets the file that was changed from the latest working commit, in this case before you renamed the file
3. git checkout -- filename2.txt takes a copy of the file from the remote server which will overwrite your local changes

If you have a Git client essentially it's just doing this behind the scenes, once that's all done you should be able to run git pull locally and have no conflicts, if you still do then something else other than a naming conflict is wrong.

How to avoid it?

Whenever you're working in version control always work from your local repository which is the cloned copy of your remote repository, it's considered bad practice to make changes directly on the server as they're harder to rollback and they can cause conflict nightmares.

Hope that helps.