Removing conflicts during merging two branches on bitbucket

On terminal

 $git status

remove untracked files if exists

$rm -rf fileWithFullAddress

$git status 

Repeat above till get clean directory

$git checkout FinalDestinationBranchForMerging

$git pull // get update for local branc

Now merge the other branch with it

$git merge MergingBranch

It will show the files having conflicts. Files will get -- head tags 

open Editor, make the changes

After making changes

$ git add ChangedFileWithAddress

$ git status

If need to remove/reset some file from the project 

$ git rest FileToBeRemoved

$ git add -A

$ git status

$ git commit -m 'The message I got while merging the branches'

$ git push

Done