edit ignore
git rm -r --cached
set ignore
set ignore
set ignore
no message
Merge branch 'feature/1' into develop

Conflicts:
	.gitignore