For new projects:
First run: generate files into scala-bootstrapper branch, merge it to master
Subsequent runs: same thing
For existing projects (where scala-bootstrapper is not already a parent of master head)
First run: generate files into scala-bootstrapper branch, merge it to master but don't actually merge the changes (it becomes an ancestor of master)
Subsequent runs: generate files into scala-bootstrapper branch, merge it to master
i tried this out on ostrich, but it doesn't look like it works.
robey@jonsnow:~/twitter/ostrich (fetch_stats)$ scala-bootstrapper ostrich --git
uncommitted files in directory
robey@jonsnow:~/twitter/ostrich (fetch_stats)$ git status
nothing to commit (working directory clean)
respect .gitignore when checking for dirty dir
only add generated files
since we're only adding generated files, no need to clean the tree in…
… the ex post facto case
better docs on --git
warning for ex post facto case with --git
suppress git output
Merge remote branch 'upstream/master'
README.md is now a template
Looks like some of this was merged several days ago, thanks! Would you please merge the remaining fixes? Or, Kyle, if you want me to do it myself let me know.
[kmaxwell@tw-mbp-kmaxwell ~/workspace]$ ./scala-bootstrapper/bin/scala-bootstrapper --git addressbook
files in directory, no git repo.
The README says you are supposed to cd into the project directory, then run scala-bootstrapper.