RomRaider

fred@cheetah:~$ date
Thu Apr 26 20:17:09 CEST 2012

That's nowish. Compare with the post time stamp in your view of the forum.

2:18:02 pm EDT = Thursday, April 26, 2012. Computed by Wolfram|Alpha at Thu Apr 26 2012 20:18:05 GMT+0200 (CEST)

So I'm 6 hours ahead, and it's 6 hours later hear than there.

In my time 9am - 12am is almost always good, maybe except sat/sun mornings due to wife.
In your time 3am - 6pm is the same. I can stretch both ends of that a bit if I need to

Will PM my skype.

Fred.

I did my homework, and these were the results:



From that I'd say that we care about getting credit to the possibles, username is fine for the not likely, and who was/is disque71 on the forum?

If we can put real names and maybe emails on the more recent attendees that would be good.

At this point I'd be happy with just the two sets of details for the definites, then I can properly get on with the job.

Fred.

OK, I've successfully joined the two SVN repos together into one giant and complete history :-) So, now I just need to get a PM from qoncept and do some more messing around and checking to ensure that things are as they should be, and we're golden :-) Exciting times!

Fred.

PS, hurry up with the PM! :-)

Should have this perfected and finalised tomorrow some time. Progress is good. I'm taking longer because I'm being fussy and careful to get it right and make it nice. May I just make an announcement thread with some instructions and so on in it once it's ready?

If you don't mind laying your outstanding stuff onto your fork of the new git repo, once ready, that'd be handy as there is quite a bit more work in doing a nice job of it. I'm 3/4 of the way through, so I hope you don't mind. :-)

Fred.

I'm okay with waiting till you have it perfected. Most of my changes are within on package so it won't be very hard for me to update.

OK, I just need to tidy a few things up and add a README.md file (my first commit!) and we're good to go! :-)

I'll post a thread on it and we can get Jared to update the website to link to the github master repo.

Exciting times :-)

Fred.

Dale, please go to this URL:

https://github.com/RomRaider/RomRaider

And hit "fork" as you did on that other repo.

Once you've done that, grab the private clone URL as you did on the other repo and clone it using eclipse, I guess.

Once you've done that add a couple of remotes:


Then to grab my changes, and examine them:


And


And maybe


And/or


And perhaps


And if you think it's my best work yet:


And then to update your remote


Or to update the official repo (which I'll add you to momentarily)


This is short for git push official master:master which is implied.

If there were any empty dirs in the old svn, and they need to exist right now, then add an empty .gitignore file inside each to make it persist. Or add something to create it before trying.

Fred.

You're added to that repo now. Keep in mind: NEVER push --force to that repo, only ever go forward from where it already is.

I just pushed a README.md and another minor change to my copy too. I'll let you push them to the official version. As much as I created it, I should earn the right to do that first :-)

Did you check here for all you need?
http://www.romraider.com/RomRaider/RomRaiderTeam

Nope, I did not. I didn't see it linked in this thread until now. I'll use info from it for the pom file, though, so thanks. I don't think it matters re the commit history, do you? They've not lost anything over the SVN setup from before. And if they're not going to be committing in future, then there will be no fragmenting of stats.

I think I finally got this to work in Eclipse with no external tools, i.e.: no separate git tools installed. I would say it's not intuitive, at least not for a layperson like me...

I did the merge, fixed what I didn't like and pushed it up to my repo and the official one.

Who will administer the official repository?

OK, you need to change a setting to avoid silliness like this:

https://github.com/RomRaider/RomRaider/network

The instructions above said merge --ff-only for a reason, comprehension. The alternative is rebase, not merge without --ff-only. If you can fast forward, you should. If you can't fast forward and someone got in first, you should do one of two things:

1) rebase onto the earlier person's work
2) tell the person that you matter more and that they should rebase before you accept their work

I would have been fine with 2, however your two commits did something that I'd already done... duplicated effort makes baby jesus cry. You should've pulled in and fast forwarded my stuff, reviewed it, then IF something needed doing, make further commits then. Do you mind if I force push my latest commit over top of your two and the eroneous merge that you unnecessarily did?

The setting to add is:

git config --global branch.autosetuprebase always

How you do that in eclipse, don't ask me, but doing random merges isn't very good, so you should find a way to implement it in eclipse if you wanna be a die-hard non-cli guy :-) To just put it into the RomRaider project, add this to the master branch config add this line:


Such that it looks like this:



You can clear up the weirdness with this line:


Move your pending changes/code, if any, out of the way before the reset line.

The extent of managing the official repo is merging/rebasing/pulling in work and pushing it there in a tidy fashion. If you'd prefer, I can handle that while you get used to git? The account itself can belong to who ever. I guess it should belong to Jared. The only action the owner of the account does is add authorised collaborators. Right now that's just me and you, and it should really only be 1 or 2 people to avoid trouble.

Fred.

Go ahead fix it up. I was "playing" before I merged your changes just to see if I was able to push anything up. I thought I had only done that to my fork.
Regardless GUI or cmdline this is all new and Greek to me.

Of those last three, you'll still need to do two of them anyway, unless you add me as a collaborator on your account/repo - then you'd only need to do one to get back to that point in order to apply your actual changes :-)

EDIT: I did the official one for you.

Fred.