git resources

Moderators: FourthWorld, heatherlaine, Klaus, kevinmiller, LCMark

Locked
mwieder
VIP Livecode Opensource Backer
VIP Livecode Opensource Backer
Posts: 3581
Joined: Mon Jan 22, 2007 7:36 am
Location: Berkeley, CA, US
Contact:

git resources

Post by mwieder » Tue Mar 11, 2014 7:50 pm

Since I think some basic grounding in git would be useful to anyone attempting to look at or work with the engine files, I'm posting some hopefully useful links here. Feel free to add others.

http://try.github.io/levels/1/challenges/1

http://stackoverflow.com/questions/3159 ... ical-guide

Nice easy-to-read introduction to how git works. Note that this is
*not* an introduction to what version control is, but it takes you on
a nice tour of "git makes more sense when you understand [...]"

Homeomorphic endofunctors, lsd and chainsaws, tinkertoys...

http://think-like-a-git.net/sections/the-end.html

mwieder
VIP Livecode Opensource Backer
VIP Livecode Opensource Backer
Posts: 3581
Joined: Mon Jan 22, 2007 7:36 am
Location: Berkeley, CA, US
Contact:

Re: git resources

Post by mwieder » Tue May 06, 2014 5:48 pm

(talking to myself here, but if you have some time to spare, illustrating how git works by building a repository from tinkertoys is brilliant...)

http://think-like-a-git.net/sections/gi ... nd-up.html ... the actual video is here:

http://www.youtube.com/watch?v=1ffBJ4sVUb4

DarScott
Posts: 227
Joined: Fri Jul 28, 2006 12:23 am
Location: Albuquerque
Contact:

Re: git resources

Post by DarScott » Tue May 06, 2014 6:21 pm

Thanks!

You are not just talking to yourself.

I will look at these as I assess what I might be getting into.

DarScott
Posts: 227
Joined: Fri Jul 28, 2006 12:23 am
Location: Albuquerque
Contact:

Re: git resources

Post by DarScott » Tue May 27, 2014 12:32 pm

I've been learning about git. Should I be focusing on github?

mwieder
VIP Livecode Opensource Backer
VIP Livecode Opensource Backer
Posts: 3581
Joined: Mon Jan 22, 2007 7:36 am
Location: Berkeley, CA, US
Contact:

Re: git resources

Post by mwieder » Tue May 27, 2014 7:17 pm

Hmmm... in what way?

I mean, the answer is probably yes, but the only github-related issue that comes to mind is dealing with pull requests And PRs are technically a github thing and not a git thing. Did you have something else in mind?

DarScott
Posts: 227
Joined: Fri Jul 28, 2006 12:23 am
Location: Albuquerque
Contact:

Re: git resources

Post by DarScott » Tue May 27, 2014 7:23 pm

That is probably it. I saw references to "pull request" and I was reading a request for permission to get pull or something.

If I use the gitHub GUI, do I need git?

I saw something called Tower for git, which might be handy when one is focusing on code and the git commands don't come to mind. Or is that sissy or otherwise counterproductive. It might no help for me to ask for advice and you say "git such and such" and I wonder how to do that with a GUI.

mwieder
VIP Livecode Opensource Backer
VIP Livecode Opensource Backer
Posts: 3581
Joined: Mon Jan 22, 2007 7:36 am
Location: Berkeley, CA, US
Contact:

Re: git resources

Post by mwieder » Tue May 27, 2014 9:59 pm

That is probably it. I saw references to "pull request" and I was reading a request for permission to get pull or something.
How a pull request works:

When you've got code committed and ready for the world you can push it to your github repository (the fork you made from the runrev original). Then when you think it's ready to be merged into the global runrev repository you want to alert the runrev team to take a look at it.

That's where a pull request comes into play ("I'm requesting you to pull this code into your repository"). Generally you log onto github, select the branch with the code to merge, and create a pull request against the master branch. That will create a diff file with the changes you have made and allow someone on the team (probably runrevmark) to evaluate it, tear it to pieces, make some acerbic comments, and force you to make changes before it can be accepted.
If I use the gitHub GUI, do I need git?
Don't know. Not sure what a github gui is.
I saw something called Tower for git, which might be handy when one is focusing on code and the git commands don't come to mind. Or is that sissy or otherwise counterproductive. It might no help for me to ask for advice and you say "git such and such" and I wonder how to do that with a GUI.
I'm not familiar with Tower. I use the git integration in Rubymine, and it's good up to a point, and then I resort to a commandline. I use gitk because it's part of the git distribution, and it does a good job of diffing the changes and showing a history of commits and merges. But it's got its limitations as well. IMO nothing beats a commandline, although you'll probably want to print out one of the many git cheat sheets on line to help you remember command syntax.

DarScott
Posts: 227
Joined: Fri Jul 28, 2006 12:23 am
Location: Albuquerque
Contact:

Re: git resources

Post by DarScott » Tue May 27, 2014 10:36 pm

When I go to github.com (redirected from github.org) I'm invited to download github and there is a pretty picture of a GUI screen. I don't know how complete that is.

I appreciate the advice. I'm going to be working at this a little each day. Maybe I should make a small change to go through the motions.

mwieder
VIP Livecode Opensource Backer
VIP Livecode Opensource Backer
Posts: 3581
Joined: Mon Jan 22, 2007 7:36 am
Location: Berkeley, CA, US
Contact:

Re: git resources

Post by mwieder » Wed May 28, 2014 3:11 am

OK - I see the gui thing on github's homepage. It's been a while since I've seen the homepage - I usually just go directly to my repositories. I still can't comment on it, not having tried it. Maybe somebody else will chime in.

My main rule of thumb about git is: Make branches. Make lots of branches. I make a new branch if I'm going to try an experiment. I make a new branch if I'm going to try fixing something. I make a new branch if I'm about to update a library. Etc. There's no downside to making branches. If something doesn't work out, you just delete the branch. If it does, then you merge it into the mainline code. Or not. You can just keep it as its own branch.

AndyP
Posts: 614
Joined: Wed Aug 27, 2008 12:57 pm
Location: Seeheim, Germany (ex UK)
Contact:

Re: git resources

Post by AndyP » Wed May 28, 2014 8:52 am

Thanks for the resources, I really liked http://www.youtube.com/watch?v=1ffBJ4sVUb4

I started using git not too long ago and downloaded the windows gui from github https://windows.github.com/ to try but I found it very cumbersome and not very intuitive. So I decided to dive into the command line and have to say this is the way to go.
You only really need to learn about 8 commands and when they have been learnt you will find the command line quicker and it just seems to make sense!
Andy Piddock
https://livecode1001.blogspot.com Built with LiveCode
https://github.com/AndyPiddock/TinyIDE Mini IDE alternative
https://github.com/AndyPiddock/Seth Editor color theming
http://livecodeshare.runrev.com/stack/897/ LiveCode-Multi-Search

mwieder
VIP Livecode Opensource Backer
VIP Livecode Opensource Backer
Posts: 3581
Joined: Mon Jan 22, 2007 7:36 am
Location: Berkeley, CA, US
Contact:

Re: git resources

Post by mwieder » Wed May 28, 2014 11:16 pm

Andy-

Yeah, I thought the tinkertoy video was a great way to explain things. When you get down to it, most git commands are just about moving labels around.

mwieder
VIP Livecode Opensource Backer
VIP Livecode Opensource Backer
Posts: 3581
Joined: Mon Jan 22, 2007 7:36 am
Location: Berkeley, CA, US
Contact:

Re: git resources

Post by mwieder » Tue Jun 17, 2014 12:49 am

Github icons, MIT-licensed.

http://octicons.github.com/

mwieder
VIP Livecode Opensource Backer
VIP Livecode Opensource Backer
Posts: 3581
Joined: Mon Jan 22, 2007 7:36 am
Location: Berkeley, CA, US
Contact:

Re: git resources

Post by mwieder » Wed Jun 18, 2014 6:54 pm

10 Tips to Push Your Git Skills to the Next Level

http://www.sitepoint.com/10-tips-git-next-level/

Locked

Return to “Engine Contributors”