Book Image

Git: Version Control for Everyone

By : Ravishankar Somasundaram
Book Image

Git: Version Control for Everyone

By: Ravishankar Somasundaram

Overview of this book

<div> <div>Git – is free software which enables you to maintain different versions of single or multiple files present inside a directory(folder), and allows you to switch back and forth between them at any given point of time. It also allows multiple people to work on the same file collaboratively or in parallel, without being connected to a server or any other centralized system continuously.<br /><br />This book is a step by step, practical guide, helping you learn the routine of version controlling all your content, every day. <br /><br />If you are an average computer user who wants to be able to maintain multiple versions of files and folders, or to go back and forth in time with respect to the files content – look no further. The workflow explained in this book will benefit anyone, no matter what kind of text or documentation they work on.<br /><br />This book will also benefit developers, administrators, analysts, architects and anyone else who wishes to perform simultaneous, collaborative work, or work in parallel on the same set of files. Git's advanced features are there to make your life easier.<br /><br /><br /><br /><br /><br /></div> </div>
Table of Contents (16 chapters)
Git: Version Control for Everyone Beginner's Guide
Credits
About the Author
Acknowledgement
About the Reviewers
www.PacktPub.com
Preface
Index

Chapter 7. Parallel Dimensions – Branching with Git

Cheap branching and merging are the two most well known and applauded features of Git. In this chapter we shall see what branching is, why you need a branch, and when you need a branch. And since we have already tried our hand at merging, having used it to merge two files for solving a merge conflict in Chapter 6, Unleash the Beast – Git on Text-based Files, we shall go one step ahead and see how to merge branches when needed.

All these are explored from an organization's point of view. We will also learn and practice methods to simplify our work by:

  • Creating simple alias for frequently used lengthy commands

  • Chaining of multiple commands for frequently used workflows