際際滷

際際滷Share a Scribd company logo

Software Carpentry - Version control slides

Download as PPT, PDF
A
anpawlik

This document provides an overview of version control systems and how they can be used to track changes to code and documents. It discusses how version control allows users to keep track of changes like a lab notebook, roll back to previous versions, back up work, collaborate remotely, resolve conflicts, and work on files from multiple locations. It describes centralized and distributed version control systems as well as remote repositories. It focuses on explaining how to use the distributed version control system Git, including commits, checkouts, branching, merging, and working with remote repositories. It concludes with recommendations around workflows and best practices when using version control in collaborative projects.

1 of 12
Download to read offline
Version Control Based on the materials by Mike Jackson, Katy Huff, Paul Ivanov, Rachel Slaybaugh, Anthony Scopatz, and Greg Wilson Copyright 息 Software Carpentry 2013 This work is licensed under the Creative Commons Attribution License See http://software-carpentry.org/license.html for more information.
With version control we can Keep track of changes like a lab notebook for code and documents Roll back changes to any point in the history of changes to our files Back up our entire history of changes in various locations Work on our files from multiple locations Identify and resolve conflicts when the same file is edited within two repositories without losing any work Collaboratively work on code or documents or any other files http://software-carpentry.org
Different version control systems Centralized version control, for example SVN Distributed version control, for example Mercurial or Git Remote repositories hosting services, for example GitHub and BitBucket Ask about a repository at your research institution! http://software-carpentry.org
Git Distributed version control Very powerful Widely used May seem a steep learning curve but its well worth it! http://software-carpentry.org
Distributed version control Local Working copy commit Remote push add checkout pull Staging area (git add.) http://software-carpentry.org
Commits i87hks hni686ad commi t abjgd687 commi t khd76enak commi t HEAD http://software-carpentry.org
Commits - checkouts i87hks hni686ad abjgd687 commi t commi t khd76enak commi t git checkout hni686ad HEAD http://software-carpentry.org
Branching MASTER i87hks hni686ad commi t abjgd687 commi t khd76enak commi t branch (git checkout b feature1) commi t FEATURE1 http://software-carpentry.org
Merging a branch MASTER abjgd687 hni686ad i87hks commi t commi t branch (git checkout b feature1) khd76enak commi t git merge feature1 commi t FEATURE1 http://software-carpentry.org
Working with remote repository Local Working copy commit checkout My laptop Remote push pull GitHub http://software-carpentry.org
Working with remote repository Remote pull push pull Working copy commit push Working copy commit checkout checkout Aleksandra John http://software-carpentry.org
Workflows and best practices Thinking about joining and contributing to project that uses a version control? Check their workflow and recommended practice (for example, each new feature in a new branch). If in doubt, ask questions! http://software-carpentry.org

More Related Content

Software Carpentry - Version control slides