Angband.oook.cz
Angband.oook.cz
AboutVariantsLadderForumCompetitionComicScreenshotsFunniesLinks

Go Back   Angband Forums > Angband > Development

Reply
 
Thread Tools Display Modes
Old October 31, 2018, 05:47   #1
wobbly
Veteran
 
Join Date: May 2012
Location: Adelaide, Australia
Posts: 1,663
wobbly is on a distinguished road
Using Github

So I have no idea how to use this thing, but with some basic instructions from Quirk I managed to get this:

https://github.com/MichaelCourtney/angband/tree/master

4 commits behind master

https://github.com/MichaelCourtney/a...ree/coffeeband

4 commits behind master, 1 commit ahead.

So I have some questions:

How do I bring those new commits from Master into my fork?

How do I selectively bring changes across?

All the stats seem to be for Angband master. I think I already tried to push to Angband by accident, I'd like to be able to play with this without accidently disrupting or annoying V coders, how do I make sure it's going to my own branch?

What even do all the terms mean? (push, pull etc.) Surely theres a Glossary somewhere?

Github tried to push some "Hello World" tutorial gimmick at me. This is fine except for the bit that I'd rather read an instruction manual. They seem to have deliberately put this up front & hidden away any manual. I mean perhaps it's useful? I'd rather look through a manual. Having this kind of gimmick shoved hard down your throat actually bugs me to the point I don't want to use it, good or not. I will in the end if it's actually worth it though.

Last edited by wobbly; October 31, 2018 at 05:53.
wobbly is offline   Reply With Quote
Old October 31, 2018, 08:53   #2
fph
Knight
 
Join Date: Apr 2009
Location: Berlin / Italy
Posts: 634
fph is on a distinguished road
Quick intro: `git branch` will tell you which branch you are in. Note that there is a 'master' branch in your cloned repository as well. `angband:master` should be the official version.
If you are using the command line, `git merge angband:master`, given from inside your branch, should bring you up to date. Pray to the old gods and the new that there are no merge conflicts, or you are up for a tedious job of reviewing conflicting changes. If you haven't configured a graphical merge tool, it will be done by inserting markers in the files such as
Code:
<<<<<<<<<<<
version A
===========
version B
>>>>>>>>>>>
`git cherry-pick` allows you to selectively bring changes across.

`git help command-name`, for instance `git help pull` will give you some documentation, in the style of man pages. A tutorial does help, even if you only skim through it. `pull` means "bring changes in from a remote source", `push` means "export your changes to a remote source (not necessarily the official angband version, it may also mean your working copy on github).
__________________
Dive fast, die young, leave a high-CHA corpse.
--
You read a scroll labeled 'lol gtfo' of Teleport Level.
fph is offline   Reply With Quote
Old November 1, 2018, 14:08   #3
Quirk
Adept
 
Join Date: Mar 2016
Posts: 199
Quirk is on a distinguished road
So, git has lots of documentation all over the web but it can be a bit detail heavy. I'll try to provide a brief overview on this push pull thing.

Git works off the idea you have a "repository" with the whole history of the source code on a machine, and lets you sync it with other machines and their repositories.

So if you go to your repository and type
git checkout master
You get your local master branch and all its known history which you can check with a git log or gitk or whatever.

If you want to get the latest changes from the repo you cloned from type
git pull
and it will pull in all the latest changes and update your branch. If you have your own commits on master it will merge them in.

So now you're up to date, you change some files, do a git add -u to add all your updates, then type git commit and write a comment. If vim worries you you can also type git commit -m "my comment" and write a short command line comment.

Then to upload your commit back to master you type git push.

If you have your own branch it's the same process to update it with github except your first push may need a set-upstream flag to tell git to create the branch in the other repo - if you need to do this git will tell you and show you the syntax.

Getting changes from master into your branch is a case of being in your branch (git checkout my branch); type git branch to check you're in the right branch then
git merge master

This merges changes from master into your current branch.

Selective changes are more tricky and may mean cherry picking commits.

Hope this helps.
Quirk is offline   Reply With Quote
Old November 7, 2018, 07:14   #4
wobbly
Veteran
 
Join Date: May 2012
Location: Adelaide, Australia
Posts: 1,663
wobbly is on a distinguished road
Ok so I have another question. Nick just changed part of a file that's different in mine but the part he changed is the same in mine. What happens if I try and pull it in? Will it try & change just that bit or the whole file.
wobbly is offline   Reply With Quote
Old November 7, 2018, 14:46   #5
fph
Knight
 
Join Date: Apr 2009
Location: Berlin / Italy
Posts: 634
fph is on a distinguished road
Yes, git can merge independent changes to different parts of the same file automatically (as long as the changed parts don't overlap, of course). That's one of the big advantages of version control systems.
__________________
Dive fast, die young, leave a high-CHA corpse.
--
You read a scroll labeled 'lol gtfo' of Teleport Level.
fph 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
Getting Angband from Github and compiling it Magnate Development 114 December 17, 2016 23:58
Poschengband github Pete Mack Variants 10 December 1, 2016 18:05
github question nppangband Development 4 September 26, 2012 10:52
Github for Windows Nick Development 0 May 30, 2012 06:25
Github help nppangband Development 9 September 20, 2011 22:11


All times are GMT +1. The time now is 17:10.


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