From talking about it today at ADD2, it sounds like our first group project is going to be something related to gaming. We had some big ideas kicking around about creating cloud-based game frameworks and multiple UIs, which sounds like a lot of fun.
I propose two things to get this moving:
- We start with everyone trying to implement a tic tac toe game. There is a sample tic tac toe app included with the sdk, which should help most people over the biggest hurdles. Try not to copy too much of it, or at least try to really understand what you're copying.
- We dedicate the end of the Monday study group meetings to discussions specific to this group project.
Thoughts?
Would a code merge be something that could be shown in next Monday's meeting? Or is it too long of a process?
I see there have been some code merges. I need a few clues as how to go forward.
Do I:
Create a new fork off of master (and consider my old fork dead)?
Like this:
https://github.com/SquidwrenchADD/sqwrGameworks
Click "Your Fork"
On my fork page keep brank:master and click Fork button.
Or change branch to Neugebauer?
Then take url and make a new Clone in Eclipse?
Thanks
There are two parts to the answer here.
Part 1:
Don't do anything. That merge broke stuff and unless you want to fix it, you will be very unhappy with the state of the code you'll receive. I didn't actually read through all the commits and do a proper merge, so after accepting that pull request the repo is back to the state it was in my 'thor' branch, plus additional changes. This isn't too terrible a problem, really, but it confuses the hell out of eclipse and makes the build process a bit of a hassle.
Part 2:
If this had been an ordinary, successful merge, the proper thing to do here would be to create a tracking branch in your working repo which was attached to SquidwrenchADD/sqwrGameworks/master. A 'git pull' would bring that branch up to date and a 'git merge' into your neugebauer/sqwrGameworks/master branch followed by a git push would bring your github repo even with the main repo.
Thanks for the info.
On the Android 3 meetup maybe the first hour should be Github workshop? Or have the Github workshop 10am-11am?
Sure. I'm personally planning on spending most of the time messing with egit anyhow, so doing it together is probably a good idea.
Question,
In Egit I created a new branch locally. Now I want to upload and have the new branch be off the Neugebauer line. Doing Push to Upstream is not working.
I get no error message, but when I look at the network map on github I see no changes.
What to do?
From the command line that would be a fairly simple task:
git push origin <branch>
I'll poke around with egit a bit and see what else I can find. I suspect this might be easier in the repo view but I have no real basis for that.
I went into the Git Gui and pushed the Push button near the bottom. That did the trick.
Thor helped me out during tonights study session, here is what was done on the command line:
[user@computer sqwrGameworks]$ cd git/sqwrGameworks
[user@computer sqwrGameworks]$ ls -l
total 44
-rw-rw-r--. 1 user user 1196 Feb 29 14:01 AndroidManifest.xml
-rw-rw-r--. 1 user user 696 Feb 29 14:01 ant.properties
drwxrwxr-x. 4 user user 4096 Feb 29 14:01 bin
-rw-rw-r--. 1 user user 3358 Feb 29 14:01 build.xml
drwxrwxr-x. 3 user user 4096 Feb 29 14:01 gen
-rw-rw-r--. 1 user user 1248 Feb 29 14:01 proguard.cfg
-rw-rw-r--. 1 user user 361 Feb 29 14:01 project.properties
-rw-rw-r--. 1 user user 1462 Feb 29 14:01 README
drwxrwxr-x. 11 user user 4096 Feb 29 14:01 res
drwxrwxr-x. 3 user user 4096 Feb 29 14:01 src
drwxrwxr-x. 3 user user 4096 Feb 29 14:01 tests
[user@computer sqwrGameworks]$ git branch -a
* master
remotes/origin/master
[user@computer sqwrGameworks]$ git remote add upstream git://github.com/SquidwrenchADD/sqwrGameworks.git
[user@computer sqwrGameworks]$ git remote
origin
upstream
[user@computer sqwrGameworks]$ git fetch upstream
From git://github.com/SquidwrenchADD/sqwrGameworks
* [new branch] master -> upstream/master
[user@computer sqwrGameworks]$ git branch -a
* master
remotes/origin/master
remotes/upstream/master
[user@computer sqwrGameworks]$ git branch --track upstream upstream/master
Branch upstream set up to track remote branch master from upstream.
[user@computer sqwrGameworks]$ git checkout upstream
Switched to branch 'upstream'
[user@computer sqwrGameworks]$ git branch
master
* upstream
[user@computer sqwrGameworks]$ git pull
Already up-to-date.
[user@computer sqwrGameworks]$ git checkout master
Switched to branch 'master'
[user@computer sqwrGameworks]$ git merge upstream
Already up-to-date.
[user@computer sqwrGameworks]$
That setup a git tracking branch and allow me to merge from upstream to my fork of the code.
Thanks again Thor for your time and help!