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

Time for action – Lisa resolves the merge conflict


Perform the following steps:

  1. Resolving the conflict is a very simple procedure. You are given four choices.

    • Specify an order and have both the changes (which in our case are Lisa's and Bob's changes)

    • Delete the existing change and impose yours

    • Delete your change and apply the change fetched

    • Delete both

    However, the fourth option is very unlikely to happen.

    Note

    To perform any of these operations on the content, one can use a common text editor or an interactive merge tool, which will give you three views (local, base, and remote) using which you need to solve your commits.

    Local view is the current modified version, base is our earlier version before modification, which gets decided by Git automatically, and remote is the modified remote version, which we are trying to fetch and merge. You need to move and order your changes along with the remote version using the arrows and indicators available. A screenshot of how an interactive merge tool...