Loading presentation...

Present Remotely

Send the link below via email or IM

Copy

Present to your audience

Start remote presentation

  • Invited audience members will follow you as you navigate and present
  • People invited to a presentation do not need a Prezi account
  • This link expires 10 minutes after you close the presentation
  • A maximum of 30 users can follow your presentation
  • Learn more about this feature in our knowledge base article

Do you really want to delete this prezi?

Neither you, nor the coeditors you shared it with will be able to recover it again.

DeleteCancel

Make your likes visible on Facebook?

Connect your Facebook account to Prezi and let your likes appear on your timeline.
You can change this under Settings & Account at any time.

No, thanks

Source Control - Using gitflow and the history that led to it

a little presentation about branching and merging and stuff
by

Curtis Schlak

on 18 February 2014

Comments (0)

Please log in to add your comment.

Report abuse

Transcript of Source Control - Using gitflow and the history that led to it

source control
a campaign for better software development
branching and merging
Generation 1
1972
1983
1984
1992
SCCS
RCS
DSEE
Clear
Case
locked files
Generation 2
1994
2002
2004
CVS
SVN
merge changes
SVK
Generation 3
1997
2005
BK
distributed...
Arch
git
darcs
bzr
version 1
version 2
version 3
merge
develop
master
pbi
work
release
tag
0.1
tag
0.3
hotfix
tag
0.2
time moves forward...
Generation 0
Not really a programming practice per se, but
abject
-oriented shops tend to follow similar version control practices. Keeping previous versions of code around, and tracking changes to code, is important even if only one programmer works on the application. Experienced
abject
coders follow a system similar to this:
Always store backups
IN THE SAME DIRECTORY
OR FOLDER
as the original code to make it easier to
When you are editing a file and realize that
YOUR CHANGES ARE BIG ENOUGH
TO MAKE REVERTING HARD,
then save a
COPY WITH A .BAK EXTENSION
SEE EACH FILE'S HISTORY
that's just
NOT
right...

so, how do we
release the kraken?
Thanks to:
my great-grandfather for emigrating from germany
@bryanray for creating the drafts of our gitflow
microsoft for putting git in tfs
@devlinliles for daring the tfs guys to put git in
chronos, father of time, for helping me stay up
really late to get this done because, honestly, I
totally forgot that I had to put this together
Full transcript