SHELL

git merge without delete files

git merge --no-commit feature
git status
git checkout master -- file1 file2 ... #sacar los archivos
git status
git add example.txt #add files wich want to merge
git status
gir commit -m "message"