July 2005
Intermediate to advanced
944 pages
158h 24m
English
book
Linux in a Nutshell, Fifth Edition
by Ellen Siever, Aaron Weber, Stephen Figgins, Robert Love, Arnold Robbins
Content preview from Linux in a Nutshell, Fifth Edition
Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.
794
|
Chapter 12: Source Code Management: An Overview
This is the Title of the Book, eMatter Edition
Copyright © 2006 O’Reilly & Associates, Inc. All rights reserved.
development. In our hypothetical example, all the bugs fixed in whizprog 1.0
to create version 1.1 should also be fixed in the ongoing 2.0 development.
Source code management systems can help you automate the process of
merging.
Conflict
A conflict occurs when two developers make inconsistent changes to the same
part of a source file. Modern source code management systems detect the
conflict, usually marking the conflicting parts of the file in your working copy
using special markers. You first discuss the conflict with the other developer,
in order to arrive at a correct resolution of the conflict. Once that’s done, you
then resolve the conflict manually (by making the appropriate changes) and
check in the new version of the file.
Client/Server
As with other “client/server” networking models, the idea here is that the
repository is stored on one machine, the server, and that different developers
may access the repository from multiple client systems. This powerful feature
facilitates distributed development, allowing developers to work easily on
their local systems, with the repository kept in a central place where it can be
easily accessed and administered.
Usage Models
Different systems have different conceptual “models” as to how they’re ...
Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Read now
Unlock full access
More than 5,000 organizations count on O’Reilly
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.Julian F.
I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.Addison B.
I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.Amir M.
I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.