While Bob was doing all these operations, Lisa made her own changes. She also happened to change the first line of the file and appended one more line to it, which made the content of the file look like the following:
Unchanged first line from source = Not any more ;) - Lisa Second line Third line Fourth line by Lisa
Then she adds the change and commits the same as shown in the following screenshot:
In the interest of sharing the change with team members, Lisa wants to push her changes to the common bare repository, but as the rule of the thumb, when working with multiple people, do a pull before pushing so as to incorporate the changes first in case somebody has already pushed before you. She does a
git pullfirst, which gives her the following error message:
Git: Version Control for Everyone
By :
Git: Version Control for Everyone
By:
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>
Related Content you might be interested in
Current Title:
Git: Version Control for Everyone
No titles found
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
Free Chapter
Breathe Easy – Introduction to Version Control System
Welcome Aboard – Installing Git
Polishing Your Routine – How to Increase Everyday Productivity
Split the Load – Distributed Working with Git
Be a Puppet Master – Learn Fancy Features to Control Git's Functions
Unleash the Beast – Git on Text-based Files
Parallel Dimensions – Branching with Git
Behind the Scenes – Basis of Git Basics
Index
Customer Reviews