git untracked files

[rdPatmore]

This is more for discussion, but thought it could turn into an actionable item.

If you have untracked files with git, the make template-update step doesn't work.

My understanding with git is that if you have several branches at the same time and create a new file or script in one branch, the other branch sees this file but shows it as untracked. Since the above step does not work with untracked files, I had to remove files related to another branch in order push changes of the current branch, or skip the template step.

Am I using git correctly? If I am is there a fix/workaround for this?

Action

• [ ] add outputs and benchmark to .gitignore

[jpolton]

@rdPatmore Perhaps we should add the outputs and benchmark directories in the .gitignore file? This would certainly reduce my number of untracked files, but may or may not address this issue?

[rdPatmore]

Yes, I think this would be useful.

[JMorado]

Seems to me that you are using git correctly.

I have not found yet the best way to deal with this and need to think a bit more about it. You can safely skip this step though, as it is related to the cookiecutter template.