Moving to Git

[Nick]

I'm trying to figure out how to use git and I feel like I'm doing it wrong.

What OS are you using?

[fizzix]

What OS are you using?

Windows. If needed I can use Linux. (red hat)

[Nick]

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

[fizzix]

sweet, thanks for the help, that was enough info for me to get it working on windows.

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

[cinereaste]

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?

[Derakon]

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.

[fizzix]

One more question:

Is there a way to merge your changes with someone elses? If so, how do you do it?

[Nick]

Is there a way to merge your changes with someone elses? If so, how do you do it?

The short answer is

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.

[Pete Mack]

Push ... Cripes, still another lame synonym for Publish...

[takkaria]

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.

[Nick]

Push ... Cripes, still another lame synonym for Publish...

See, I was never aware of publish in version control - so to me Publish is a lame synonym for push

[chem]

What is the status of [V] these days? The last 3 releases have been:

Version 3.1.2 beta v2
Version 3.1.1.1626 beta
Version 3.1.0 beta

There has not been a non-beta release in two and a half years. I see an AngbandBase thread but not a [V] release thread. How are things going?

[Magnate]

What is the status of [V] these days? The last 3 releases have been:

Version 3.1.2 beta v2
Version 3.1.1.1626 beta
Version 3.1.0 beta

There has not been a non-beta release in two and a half years. I see an AngbandBase thread but not a [V] release thread. How are things going?

Well, the "beta" label is slightly misleading. 3.1.2v2 is at least as stable as 3.0.9 - the "beta"-ness really applies to the gameplay changes rather than the bugginess of the code.

It has been a while since 3.1.2v2, and there have been some significant developments, the big one being the move to git and an explosion of branched developments (ewert's iVanilla being the most conspicuous). It will take a while to pull together a coherent release of V from all these branches, but I hope it would be possible by/over xmas. This is my personal view, and I haven't discussed it yet with takk - but having managed the transition to git, the goal is definitely now to pull together a new release. I don't know whether it will be called 3.1.3 or 3.2, but it doesn't really matter.

[EpicMan]

The number of gameplay changes (mainly missile combat) that have gone in since the last release should at least make it 3.2, to nit-pick a little.

[fizzix]

Ok, I've just spent about two hours trying to merge the master branch into my own and I've come to the conclusion that I don't understand at all how git works.

Online sites don't seem to help at all, I'm missing something *much* more fundamental.

I'd be content to just overwrite my branch with the current angband master branch, but I can't even get that to work...

I'm so useless...

edit: Ok, i think I accomplished this in the most asinine way imaginable... It still would be nice if someone was to tell me what I should have done...