June 2004
Intermediate to advanced
319 pages
12h 58m
English
Content preview from Version Control with Subversion
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.
This is the Title of the Book, eMatter Edition
Copyright © 2007 O’Reilly & Associates, Inc. All rights reserved.
50
|
Chapter 4: Branching and Merging
There are a number of problems with this, though. First, it’s not very safe. Most peo-
ple like to save their work to the repository frequently, should something bad acci-
dentally happen to their working copy. Second, it’s not very flexible. If you do your
work on different computers (perhaps you have a working copy of /calc/trunk on two
different machines), you’ll need to manually copy your changes back and forth, or
just do all the work on a single computer. By that same token, it’s difficult to share
your changes in progress with anyone else. A common software development best
practice is to allow your peers to review your work as you go. If nobody sees your
intermediate commits, you lose potential feedback. Finally, when you’re finished
with all your changes, you might find it very difficult to remerge your final work with
the rest of the company’s main body of code. Sally (or others) may have made many
other changes in the repository that are difficult to incorporate into your working
copy—especially if you run
svn update after weeks of isolation.
The better solution is to create your own branch, or line of development, in the
repository. This allows you to save your half-broken work frequently without inter-
fering with others, yet you can still ...
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.