Software Development Cross Solution - Index of - Free

Tags, branches, and trunks, oh my!
Your version control system has got a lot going on now, but most of the
complexity is managed by the server and isn’t something you have to
worry about. We’ve tagged the 1.0 code, made fixes in a new branch, and
still have current development happening in the trunk. Here’s what the
repository looks like now:
BeatBox Pro 1.0
Now we’ve got a tag in our
code that marks this exact
revision as version-1.0
We’ve got a branch for 1.x fixes,
and we can work on that code
separate from new development.
Tags are
snapshots of
your code. You
should always
commit to a
branch, and
never to a tag.
�
�
�
trunk
version-1
You’d commit
fixes to version
1.0 code here.
The trunk is where your active
development should go; it should
always represent the latest version
of your software.
A tag is a name attached to a
specific revision of the items in your
repository so that you can easily
retrieve that revision later.
Sometimes you might need to
commit the same changes to a
branch and the trunk if the change
applies to both.
Download at WoweBook.Com
All of Bob’s fixes are still
in the main branch, which is
called the trunk.
BeatBox Pro 1.x
�
�
version control
2.0!
Branches are copies of your code
that you can make changes to
without affecting code in the trunk.
Branches often start from a tagged
version of the code.
Tags are static—you don’t commit
changes into them. Branches are
for changes that you don’t want
in the trunk (or to keep code away
from changes being made in the
trunk).
you are here 4 207