• Announcements

    • khawk

      Download the Game Design and Indie Game Marketing Freebook   07/19/17

      GameDev.net and CRC Press have teamed up to bring a free ebook of content curated from top titles published by CRC Press. The freebook, Practices of Game Design & Indie Game Marketing, includes chapters from The Art of Game Design: A Book of Lenses, A Practical Guide to Indie Game Marketing, and An Architectural Approach to Level Design. The GameDev.net FreeBook is relevant to game designers, developers, and those interested in learning more about the challenges in game development. We know game development can be a tough discipline and business, so we picked several chapters from CRC Press titles that we thought would be of interest to you, the GameDev.net audience, in your journey to design, develop, and market your next game. The free ebook is available through CRC Press by clicking here. The Curated Books The Art of Game Design: A Book of Lenses, Second Edition, by Jesse Schell Presents 100+ sets of questions, or different lenses, for viewing a game’s design, encompassing diverse fields such as psychology, architecture, music, film, software engineering, theme park design, mathematics, anthropology, and more. Written by one of the world's top game designers, this book describes the deepest and most fundamental principles of game design, demonstrating how tactics used in board, card, and athletic games also work in video games. It provides practical instruction on creating world-class games that will be played again and again. View it here. A Practical Guide to Indie Game Marketing, by Joel Dreskin Marketing is an essential but too frequently overlooked or minimized component of the release plan for indie games. A Practical Guide to Indie Game Marketing provides you with the tools needed to build visibility and sell your indie games. With special focus on those developers with small budgets and limited staff and resources, this book is packed with tangible recommendations and techniques that you can put to use immediately. As a seasoned professional of the indie game arena, author Joel Dreskin gives you insight into practical, real-world experiences of marketing numerous successful games and also provides stories of the failures. View it here. An Architectural Approach to Level Design This is one of the first books to integrate architectural and spatial design theory with the field of level design. The book presents architectural techniques and theories for level designers to use in their own work. It connects architecture and level design in different ways that address the practical elements of how designers construct space and the experiential elements of how and why humans interact with this space. Throughout the text, readers learn skills for spatial layout, evoking emotion through gamespaces, and creating better levels through architectural theory. View it here. Learn more and download the ebook by clicking here. Did you know? GameDev.net and CRC Press also recently teamed up to bring GDNet+ Members up to a 20% discount on all CRC Press books. Learn more about this and other benefits here.
Sign in to follow this  
Followers 0
IndyOfComo

I need help with version control software.

4 posts in this topic

Oh jeeze...
My partner and I have had problems properly operating the whole version control stuff. He is a bit more familiar than I am, yet I/we still have issues. I'll just handle my current predicament, see if you all can tell me how to fix my mess-ups, and how to avoid it in the first place.

So we have our own tasks we're working on of course. We are using Mercurial via TortoiseHG to connect with our BitBucket account. Starting from the same point, he commits one change to BitBucket, and then another. I get done with my work, locally commit my changes, and ask THG to pull down changes.
I end up with two lines in my THG graph now, my line and his(diverging from the last common version) which has two nodes on it.. I try to merge, but I just end up creating a spiderweb of red and blue. (It's late, I'm ignorant and frustrated, and at times like that my usual solution to square peg-round hole is a mallet. ...Not good, just saying....)

Why did this not do what I was expecting--namely, combine his changes with mine? How should I/we proceed in the future to avoid this? Is there an option I should have set to avoid this?

grrr....later I'll ask how I can fix it.... Edited by IndyOfComo
0

Share this post


Link to post
Share on other sites
I hate using mercurial, and tortoise hg just plain sucks. I much prefer to use SVN.

But anyways. Get both changesets and manually merge the changes! I believe you have merged automatically the changes?
0

Share this post


Link to post
Share on other sites
[quote name='IndyOfComo' timestamp='1349645763' post='4987780']
Why did this not do what I was expecting--namely, combine his changes with mine? How should I/we proceed in the future to avoid this? Is there an option I should have set to avoid this?
grrr....later I'll ask how I can fix it....
[/quote]

I see this time and time again from beginner coders and lead coders alike. You don't want to and usually can't avoid merge conflicts and it isn't really that much of a big deal if you get them anyway.

To do a merge I go through this process:[list=1]
[*]Check my files (Or hunks) for changes not needed or unintended changes and reset them
[*]Pull and merge
[*]Fix any conflicts using a diff tool. (SourceTree on Mac shows differences and I just use that + monodevelop) I don't have a recommended for Windows
[*]Commit \ push merge
[/list]
Conflicts are not errors! Edited by CRYP7IK
2

Share this post


Link to post
Share on other sites
So, when I pull down my partner's changes after locally commiting my own work, should I expect to see divergent heads/lines? This is normal, or did I miss something?
(I guess I don't understand the logic of not merging it with my own...I have finished/committed my work, why in the world would I want to ignore it?)

Here's another question: Is it a problem to have divergent lines "earlier" in the lineage, even red ones, if they all come together to one head at the top?
0

Share this post


Link to post
Share on other sites
[quote name='IndyOfComo' timestamp='1349707614' post='4988006']
So, when I pull down my partner's changes after locally commiting my own work, should I expect to see divergent heads/lines? This is normal, or did I miss something?
(I guess I don't understand the logic of not merging it with my own...I have finished/committed my work, why in the world would I want to ignore it?)

Here's another question: Is it a problem to have divergent lines "earlier" in the lineage, even red ones, if they all come together to one head at the top?
[/quote]

Yes that's fine. You will merge it with your own, I never said that but I did say that when you do merge it and a conflict happens you just use a diff tool (google is your friend) to help you fix them.

No that is not a problem. 'Divergent lines' or branches at all are not a problem they are the solution.

You should read here:
http://mercurial.selenic.com/wiki/Branch
0

Share this post


Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!


Register a new account

Sign in

Already have an account? Sign in here.


Sign In Now
Sign in to follow this  
Followers 0