Game Development Version Control

Comments

• stickyboot Join Date: 2004-01-29 Member: 25711Members, Constellation

  February 2013 edited February 2013

  Linus Torvalds helped create git, not Github. git != Github. git is the version control system. Github is just a company that hosts git repositories and brings a schmancy web interface along for the ride. Git is infinitely better than SVN in most ways, and I say this because its also easy to agree with Linus himself on the topic:
  
  Git doesn't handle large files all that well if they can't delta compress and/or change a lot, but there are some workable strategies around that.
  
  As for trouble merging when you have a conflict? http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html and perform a 3 way merge using your systems defined merge tool. The cool thing about this is that it is already set up by default usually. Not to bad
  
  If you are struggling with lots of merge conflicts, you may want to look into something like git flow:
  http://nvie.com/posts/a-successful-git-branching-model/ which is a decent framework for avoiding nasty merges. There is even a set of git extensions that add `git flow` commands to make the process even more sugar: https://github.com/nvie/gitflow
  
  And if a GUI is your thing, I'm pretty sure git may have more options at this point than SVN. Here are my selections:
  TortoiseGit for windows (Its like TortoiseSVN): http://code.google.com/p/tortoisegit/
  Gitx-dev for OS X: http://rowanj.github.com/gitx/
  GitG for Linux: http://git.gnome.org/browse/gitg
  
  
  That being said, does UW have any plans to incorporate Github into the NS2 lua workflow? Given the social nature of github, I would predict it might encourage more community involvement with the lua code via pull requests. Maybe just mirror the current state of the SVN repo?
  
  
  UPDATE:
  I was just skimming some of the gamejam videos. You guys were using 'github for windows', which is probably a major source of your problems. Stick with plain git and TortoiseGit, and use github as a central repo and you will probably save yourself a headache that is github's own client. Give git another chance!

  5 Off Topic Disagree 2Agree 3Awesome
• Milanium Join Date: 2012-12-27 Member: 176388Members

  February 2013

  In fact merge conflicts are less scary than they look like. Just edit the files so the code you want to stay keeps in it and git rebase --continue or whatever you were doing. http://git-scm.com/book/en/ explains this more thoroughly.

  0 Off Topic Disagree Agree Awesome
• lwf Join Date: 2006-11-03 Member: 58311Members, Constellation

  February 2013 edited February 2013

  There's a Tortoise UI for Git as well.
  
  https://code.google.com/p/tortoisegit/
  
  
  Edit: Oops, never mind, stickyboot already addressed that and much more.

  0 Off Topic Disagree Agree Awesome
• PHLAK Join Date: 2010-07-16 Member: 72448Members

  February 2013

  Note: Git is the version control system created by Linus Torvalds. GitHub is an online repository hosting and code sharing service built for Git.

  0 Off Topic Disagree Agree Awesome
• remram Join Date: 2012-01-07 Member: 139815Members

  March 2013 edited March 2013

  It is shameful to write an article about version control without having the slightest understanding of what Git is. No, Github is not a version control software. It has nothing to do with Linus Torvalds (who dislikes it). Even correcting the names, the overall article is misguiding as hell.
  
  Why, UWE?
  
  I propose something like that: http://bit.ly/YReb60

  0 Off Topic Disagree Agree Awesome