Book Image

C++ Game Development Cookbook

By : Druhin Mukherjee
Book Image

C++ Game Development Cookbook

By: Druhin Mukherjee

Overview of this book

<p>C++ is one of the preferred languages for game development as it supports a variety of coding styles that provides low-level access to the system. C++ is still used as a preferred game programming language by many as it gives game programmers control of the entire architecture, including memory patterns and usage. However, there is little information available on how to harness the advanced features of C++ to build robust games.</p> <p>This book will teach you techniques to develop logic and game code using C++. The primary goal of this book is to teach you to create high-quality games using C++ game programming scripts and techniques, regardless of the library or game engine you use. It will show you how to make use of the object-oriented capabilities of C++ so you can write well-structured and powerful games of any genre. The book also explores important areas such as physics programming and audio programming, and gives you other useful tips and tricks to improve your code.</p> <p>By the end of this book, you will be competent in game programming using C++, and will be able to develop your own games in C++.</p>
Table of Contents (20 chapters)
C++ Game Development Cookbook
Credits
About the Author
About the Reviewer
www.PacktPub.com
Preface
Index

Resolving conflicts


Let us consider a single source file that has been worked on by multiple programmers. You might have some local changes. When you try to update, it may happen that the SVN client is smart enough to merge the files together. However, in most cases it will not be able to merge properly and we need to resolve conflicts effectively. The SVN client, however, will show the files that are in conflict.

Getting ready

For this recipe, you will need a Windows machine and an installed version of an SVN client. A versioned project is also necessary.

How to do it...

In this recipe, we will find out how easy it is to resolve conflicts:

  1. Take a project that is already versioned and committed to SVN.

  2. Open a file in an editor and make changes to the file.

  3. Perform the SVN Update operation.

  4. The files now show a conflict.

  5. See the differences between the two files using the Diff tool or Win Merge (you may need to install Win Merge separately).

  6. Generally, the left-hand side will be the local revision...