Closed bngo92 closed 12 years ago
Could you squash these two commits? Or at least rename the .swp removal commit.
git rebase -i HEAD~2
Then just change the bottom "pick" to "s" or "squash"
edit: then just add -f to your git push
Take a look at Gramm's fork & branch. https://github.com/gramm/OpenAnt/tree/Gramm
He's got some code that allows for underground digging (Click somewhere and the ant will dig a path to that point).
His branch does a lot of restructuring. Are you planning to switch to it?
A lot of restructuring indeed. I'm not sure whether or not a complete switch is best, but there are some aspects which we can use... scent system, pathfinding for digging. Also, at this point we won't be able to perform an automatic merge. At some point I'll sift through the code (unless someone else wants to?) and see if parts can be merged.
Hi. I saw the project on reddit and it looking very interesting. I was hoping I could learn from it and contribute.