back
try
add ignore file
temp commit
Fix conflict
Edit .gitignore
Merge branch 'ignore-branch'