The other very rusty / unfamiliar piece for me, and probably a tad more important than blocks!
Back when I was still doing some dev a couple years ago it was all about Perforce and Eclipse/WSAD. I've gotten so used to the terms in P4 and "reading the matrix" on the insane revision graphs we have here (main app probably built up around two hundred branches...) that git is just different enough to throw me off when I think I've figured out what I'm supposed to do
Since then I've just done command line and Notepad++. Trying to get set back up now!
For other newcomers to the project we'll get over time I'm thinking it might be nice to throw together a quick primer on how to pull the code from github (fork to own account? just grab code read-only and submit "pull" requests? What's the difference between pull and push, fetch and checkout, etc.) and how to best get setup in IntelliJ to start making some magic happen. For instance, don't allow IntelliJ to make a new project, as it'll overwrite the working project file in git and end up not working at all; and if nothing seems to happen when you ask IntelliJ nicely to check out via git make sure you've got the SSH setup step working first
At this point I'm theorizing that I do something like the following (yet haven't figured it out yet)
1) Fork the project on github - done
2) Check out the source via a new project in IntelliJ so the code will show up (first terminology quirk as check out in Perforce just makes a file you've already got from your active branch writable)
3) "Merge" later revisions from the remote parent branch (which apparently is not origin, as that is your personal fork...) into your project somehow
4) Submit the changes to your personal branch somehow?
5) Start actually working on something useful
6) ....
7) Profit?
I made a quick target page for related instructions - http://wiki.movingblocks.net/Blockmania/DevSetup
Back when I was still doing some dev a couple years ago it was all about Perforce and Eclipse/WSAD. I've gotten so used to the terms in P4 and "reading the matrix" on the insane revision graphs we have here (main app probably built up around two hundred branches...) that git is just different enough to throw me off when I think I've figured out what I'm supposed to do
Since then I've just done command line and Notepad++. Trying to get set back up now!
For other newcomers to the project we'll get over time I'm thinking it might be nice to throw together a quick primer on how to pull the code from github (fork to own account? just grab code read-only and submit "pull" requests? What's the difference between pull and push, fetch and checkout, etc.) and how to best get setup in IntelliJ to start making some magic happen. For instance, don't allow IntelliJ to make a new project, as it'll overwrite the working project file in git and end up not working at all; and if nothing seems to happen when you ask IntelliJ nicely to check out via git make sure you've got the SSH setup step working first
At this point I'm theorizing that I do something like the following (yet haven't figured it out yet)
1) Fork the project on github - done
2) Check out the source via a new project in IntelliJ so the code will show up (first terminology quirk as check out in Perforce just makes a file you've already got from your active branch writable)
3) "Merge" later revisions from the remote parent branch (which apparently is not origin, as that is your personal fork...) into your project somehow
4) Submit the changes to your personal branch somehow?
5) Start actually working on something useful
6) ....
7) Profit?
I made a quick target page for related instructions - http://wiki.movingblocks.net/Blockmania/DevSetup