How to use git merge --squash?

Question

I have a remote Git server, here is the scenario which I want to perform:

• For each bug/feature I create a different Git branch

• I keep on com

Answer 1

if you get error: Committing is not possible because you have unmerged files.

git checkout master
git merge --squash bugfix
git add .
git commit -m "Message"

fixed all the Conflict files

git add . 

you could also use

git add [filename]