Rebase autofix strategy

[johnsonr]

Avoid extra commit

[jessitron]

is this the one where we do a merge in the original directory? we may be able to do this with a merge strategy ... point me to the code?

[johnsonr]

FileSystemProjectLoader

[atomist[bot]]

Thanks for your contribution!

This issue has been automatically marked with stale because it has not had any activity in last 50 days. It will be closed in 7 days if no further activity occurs. To prevent closing, label with defer or blocked or any of the changelog: labels.