Ticket #339 (fixed task)
sort submodules
- Created: 2011-03-08 23:42:07
- Reported by: Reines
- Assigned to: Reines
- Milestone: 2.0-alpha1
- Component: code
- Priority: high
Git is being a pain and failing to merge old changes into the fluxbb-2.0 branch due to the submodules match "real" files in the old branch. I think moving the submodules into a different directory should fix this, though git doesn't seem to have support for either removing or moving submodules, so it will need done manually and a post made describing how to fix your repository... urgh
History
Reines 2011-03-15 17:54:44
- Status changed from open to fixed.
I've moved them into a modules folder now.