RomRaider

I had a look at this this morning:

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

And it made me a bit sad. Silly Fred.

Some GREAT advice for working with others using git:

• NEVER run "git pull"
• ALWAYS run "git fetch remotename"
• NEVER run "git merge ref"
• ALWAYS run "git merge --ff-only ref" first and if that fails, use gitg or gitk or github (if it's all public) to see what's happening and then:
• ALWAYS run "git rebase <options> <target>/<source>" to tidy up the situation.
• NEVER run "git push --force" if you're an upstream

I see that quite a few people are hacking on it, but I see what looks like good core work coming from Scott. I wonder if allowing him to rebase his own work onto RR/master would be a good idea?

If everyone shares often, and before sharing everyone rebases on whatever has been most recently shared, then it'll make things a lot smoother.

I also see lots of work from Merp on a named branch. I expect he'll rebase that onto whatever is officially master/latest when the time comes. Hopefully that's not a huge headache as his base is pretty old now. Merp, if you rebase it often, the work each time is smaller. name the head locally and try rebasing on to rr/master and see what happens. If it works out well, great, roll with it, if not, try again another time, or do it incrementally to some half way point.

I guess what is missing is this:

1) Share as often as possible so what's public is as up to date as possible
2) If you're "in charge" bring in others work as soon as possible/reasonable/it's clean enough/etc

In the case of Scott, I'd like to see his stuff and Dale's stuff getting rebased onto public master and included in the official repo on a dailyish basis.



But my opinion is just that, and I don't matter here :-)

Just sharing some advice.

Keep up the good work!

Fred.

Fred,

Not sure I did this right. I asked dale to merge my changes into RR main. Some of Scott's changes also merged into RR main. I wanted scott's changes in my branch. I did a pull request per GitHub website documentation when i search for merge. Was this the improper way to do it?

Fred,

I think that I have officially messed up my repository and indirectly messed up Dale. Can you give it a quick look and tell me what you think? It may be most useful to get on Skype and work through this. Don't be afraid to reach through your monitor and smack me around a bit. I am still learning Git. When I can find some time I will work on learning Git and likely moving some of my personal repositories to Git. But until then I will be a Git N00b.

Scott

Mrs is in tears right now, might be losing her job, and I've not got one, so tonight may be out, but she may go out for a while, if so, I'm yours.

No need for smacking around. The biggest issue here is timely pushes. And clean/as small as possible pushes.

If both of you promise you have all work commited/pushed, I could take a crack at cleaning it up to give you a base to work from from now onward.

Let me take a look.

Looks like an easy fix. You seem to have rebased your work excellently, then accidentally merged in your old copy, and ended up with two of each commit in the history.

If I'm right, I can just remove the merge commit, pull Dale's one commit above that back a notch, and you're good to go. Let me know if that's what you want done.

Dale could do this by the following:

git checkout master
git branch savedBackup1
git reset --hard bf0c4fe2146b8aaaab182cd3a3d4d00ef7
git push --force romraider HEAD:master

then reapply this diff manually:


And commit it, and push it, and call it a day.

Fred.

Fred,

That sounds about right. I definitely noticed that at some point I had brought the changes back in and had duplicated commits. I am all for cleaning this up and getting a new base to work from. I do not have anything to check in at the moment so this would be great timing for me. basically all of my work is committed and pushed right now and I am not currently working on anything new.

It would be good to clean this up and then get a new RC out there. I know that I have fixed several reported issues with the current RC and I'm sure that others out there would like to get at these changes.

Scott

Oh yeah. Let me know if you are ever interested in relocating here to Washington State. I'm pretty sure that I can diffidently get you a job like yesterday.

Is this what was expected?

Do I then do the same to my Github repo?

Dale, yes, you can push the same ref to your repo to remove that history, if you wish :-)

You might want to unsecure your SSH key so that you don't have to type credentials all the time. Secured keys are for logging into things. You can use a different key for git if you need your current key to be rock solid.

Salty, thanks for the offer, though green cards are as hard to come by as Spanish residency visas, apparently. I'm done with other countries... next move is home, to stay, for ever. Well, maybe after Germany LOL :-/

Fred.

K thanks.

Fred, help, we are messed up again!

Just linked Fred on IRC.

What commands produced the latest commit?

Side note: in order to remove user/pass authentication from your git, in addition to using a SSH key without password authorization, you'll need to edit the config file in the .git folder and alter the 'https://github.com/UserName/RepoName.git' lines to 'git@github.com:UserName/RepoName.git' for each repo.

Two merges (by scott) did that. Isn't that the same old commit that we already fixed? Will take a look later. Have to go out now.

FWIW, I'd take Dale's history as golden, and try to fix up scott's.

IE force push this so that at least the master repo is clean: 509cc6d97f9fc388154f50f736397fd5dd2e3e05

And worry about getting Scott's stuff integrated later :-)

Fred.

Doh, I lied. Dale had a hand in this :-)

https://github.com/RomRaider/RomRaider/ ... 3c65ab297e

This one's clean and can be applied/cherry picked onto the last one I mentioned.

What's in the other ones, who knows. diff is your friend. I use kdiff3 on all three platforms, it's awesome.


Fred.

I see that all is well :-)

Might pay to use gitg/gitk/temp-branch+github-network-view to review rebases/merges visually before pushing to the official master? I do this constantly with gitg to cross check myself. It's difficult to visualise the relationships without actually seeing it IMO.

Fred.