Angband.oook.cz
Angband.oook.cz
AboutVariantsLadderForumCompetitionComicScreenshotsFunniesLinks

Go Back   Angband Forums > Angband > Development

Reply
 
Thread Tools Display Modes
Old October 24, 2010, 00:24   #31
Nick
Vanilla maintainer
 
Nick's Avatar
 
Join Date: Apr 2007
Location: Canberra, Australia
Age: 54
Posts: 7,643
Donated: $60
Nick is on a distinguished road
Quote:
Originally Posted by fizzix View Post
I'm trying to figure out how to use git and I feel like I'm doing it wrong.
What OS are you using?
__________________
One for the Dark Lord on his dark throne
In the Land of Mordor where the Shadows lie.
Nick is offline   Reply With Quote
Old October 24, 2010, 00:25   #32
fizzix
Prophet
 
Join Date: Aug 2009
Location: Madison, Wisconsin, US
Posts: 3,002
fizzix is on a distinguished road
Quote:
Originally Posted by Nick View Post
What OS are you using?
Windows. If needed I can use Linux. (red hat)
fizzix is offline   Reply With Quote
Old October 24, 2010, 00:39   #33
Nick
Vanilla maintainer
 
Nick's Avatar
 
Join Date: Apr 2007
Location: Canberra, Australia
Age: 54
Posts: 7,643
Donated: $60
Nick is on a distinguished road
Quote:
Originally Posted by fizzix View Post
Windows. If needed I can use Linux. (red hat)
OK - I don't understand how the various windows clients work, but here's an outline in Linux:
  1. Set up an identity on github (I don't recall exactly what that required - I think you need at least to generate ssh keys to use - I just followed the site instructions)
  2. Go to the main takkaria/angband repository, and make a fork - it will be called fizzix/angband (if that's your github identity)
  3. Make a directory, enter it and run 'git clone URL', where URL is the one in the box on the main page of your fork on github
  4. After making changes, 'git commit -a' will commit them (it can be made more complicated than this, but need not be; you will be prompted for a commit message)
  5. 'git push origin master' will push your changes back to github.

I may have missed stuff, and there's a lot more you can do, but I think that's the basics. I didn't get it in a day
__________________
One for the Dark Lord on his dark throne
In the Land of Mordor where the Shadows lie.
Nick is offline   Reply With Quote
Old October 24, 2010, 01:43   #34
fizzix
Prophet
 
Join Date: Aug 2009
Location: Madison, Wisconsin, US
Posts: 3,002
fizzix is on a distinguished road
sweet, thanks for the help, that was enough info for me to get it working on windows.

Quote:
Originally Posted by Nick View Post
OK - I don't understand how the various windows clients work, but here's an outline in Linux:
  1. Set up an identity on github (I don't recall exactly what that required - I think you need at least to generate ssh keys to use - I just followed the site instructions)
  2. Go to the main takkaria/angband repository, and make a fork - it will be called fizzix/angband (if that's your github identity)
  3. Make a directory, enter it and run 'git clone URL', where URL is the one in the box on the main page of your fork on github
  4. After making changes, 'git commit -a' will commit them (it can be made more complicated than this, but need not be; you will be prompted for a commit message)
  5. 'git push origin master' will push your changes back to github.

I may have missed stuff, and there's a lot more you can do, but I think that's the basics. I didn't get it in a day
fizzix is offline   Reply With Quote
Old October 24, 2010, 04:09   #35
cinereaste
Scout
 
Join Date: May 2010
Posts: 39
cinereaste is on a distinguished road
Quote:
Originally Posted by Nick View Post
OK - I don't understand how the various windows clients work, but here's an outline in Linux:
  1. Set up an identity on github (I don't recall exactly what that required - I think you need at least to generate ssh keys to use - I just followed the site instructions)
  2. Go to the main takkaria/angband repository, and make a fork - it will be called fizzix/angband (if that's your github identity)
  3. Make a directory, enter it and run 'git clone URL', where URL is the one in the box on the main page of your fork on github
  4. After making changes, 'git commit -a' will commit them (it can be made more complicated than this, but need not be; you will be prompted for a commit message)
  5. 'git push origin master' will push your changes back to github.

I may have missed stuff, and there's a lot more you can do, but I think that's the basics. I didn't get it in a day

What's the difference between steps 4 and 5, committing and pushing?
cinereaste is offline   Reply With Quote
Old October 24, 2010, 04:52   #36
Derakon
Prophet
 
Derakon's Avatar
 
Join Date: Dec 2009
Posts: 8,792
Derakon is on a distinguished road
Committing saves the changes to your local repository. Pushing copies the changes to the remote master repository. Until you push, your changes are not visible to other people.
Derakon is offline   Reply With Quote
Old October 24, 2010, 18:57   #37
fizzix
Prophet
 
Join Date: Aug 2009
Location: Madison, Wisconsin, US
Posts: 3,002
fizzix is on a distinguished road
One more question:

Is there a way to merge your changes with someone elses? If so, how do you do it?
fizzix is offline   Reply With Quote
Old October 24, 2010, 21:43   #38
Nick
Vanilla maintainer
 
Nick's Avatar
 
Join Date: Apr 2007
Location: Canberra, Australia
Age: 54
Posts: 7,643
Donated: $60
Nick is on a distinguished road
Quote:
Originally Posted by fizzix View Post
Is there a way to merge your changes with someone elses? If so, how do you do it?
The short answer is
Code:
git merge BRANCHNAME
will merge BRANCHNAME into the branch you're on. The tricky part is getting BRANCHNAME right, and dealing with conflicts. If you've forked from takkaria's branch, you probably want upstream/master - but there are complications.

This is a good reference.
__________________
One for the Dark Lord on his dark throne
In the Land of Mordor where the Shadows lie.
Nick is offline   Reply With Quote
Old October 26, 2010, 06:32   #39
Pete Mack
Prophet
 
Join Date: Apr 2007
Location: Seattle, WA
Posts: 5,271
Donated: $40
Pete Mack is on a distinguished road
Push ... Cripes, still another lame synonym for Publish...
Pete Mack is online now   Reply With Quote
Old October 26, 2010, 07:40   #40
takkaria
Veteran
 
takkaria's Avatar
 
Join Date: Apr 2007
Posts: 1,923
Donated: $40
takkaria is on a distinguished road
Quote:
Originally Posted by Pete Mack View Post
Push ... Cripes, still another lame synonym for Publish...
I think it's been chosen as the antonym of "pull" in git, if that makes any difference.
__________________
takkaria whispers something about options. -more-
takkaria is offline   Reply With Quote
Reply


Currently Active Users Viewing This Thread: 1 (0 members and 1 guests)
 
Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump

Similar Threads
Thread Thread Starter Forum Replies Last Post
Sangband SVN/Git/? camlost Development 7 September 9, 2010 18:31
[Z+]Crash when moving arrows into a container Asgoth Variants 1 December 6, 2008 04:15


All times are GMT +1. The time now is 20:08.


Powered by vBulletin® Version 3.8.11
Copyright ©2000 - 2019, vBulletin Solutions Inc.