Version Control. Ioannis N. Athanasiadis. with slides from Solution Perspective Media and Software Carpentry

Size: px

Start display at page:

Download "Version Control. Ioannis N. Athanasiadis. with slides from Solution Perspective Media and Software Carpentry"

Roderick Harrington
5 years ago
Views:

1 Ioannis N. Athanasiadis with slides from Solution Perspective Media and Software Carpentry 1

2 What is it A method for centrally storing files Keeping a record of changes Who did what, when in the system Covering yourself when things inevitably go wrong 2

3 : Why? Individual Back-up methodology Increments know which version is live Point in time marking aka. Tagging Branching release versions maintained & main development can continue Change history when features were added or amended Team As Individual plus: Allow multiple developers (in remote locations) to work on same code base Merge changes across same files handle collisions Answer who did what blame / praise 3

4 : Centralised 4

5 : Distributed 5

6 Version control practice Code centralised in a repository Check out a working copy into a development area on local machine Make changes, test etc. Changes committed back to the central repository usually with a useful comment Each work session an update is performed to get changes from other team members 6

7 Version control - tools Change log who, when, what Check for differences between current version and any version in repository Create and apply patches between tags, branches and trunk Recover old versions of files, roll-back when it goes wrong Recover old versions of project single version number for all files (unlike e.g. CVS) 7

8 In this group we use 8

9 9

10 Bitbucket go online open an account preferably firstnamelastname communicate it to your team instructor 10

11 Copyright Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See for more information.

15 ? Version Control

21 version control! Version Control

30 ? Version Control

39 ! Version Control

42 More gooder Version Control

44 1 Version Control

45 1 2 Version Control

46 Version Control

47 Version Control

48 created by Greg Wilson July 2010 Copyright Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See for more information.

49 Exercise with git Version control in practice

50 Brian and Luke work together with GIT (Both) Pull a project from bitbucket Brian: add a namespace! (New namespace) + Commit and Push! Luke: Pull the Project + Add a Context (Change) + Commit and Push! Brian: Pull the Project + See version history and differences! + Modify the Context (Change) + Commit and Push! Luke: + Modify the Context (Change) + Commit and Push! (Conflict!) 50

51 Version control in k.lab/git 1. Pull At the start of your workday or modeling session: Right click on the Project, choose Team Pull 2. Make changes Work on your code, save your file often. Check error messages and try to ensure your code doesn't contain any errors before you commit. If needed, change any uncertain code into 'comments' starting with // so k.lab will not process them as errors. 3. Commit this marks your changes as ones you want to be part of the shared project. Right click on the Project, choose Team Commit 4. Pull Team Pull to ensure you're comparing with the most current version of the entire project No Conflicts Conflict? OR OR Merge Team Merge tool 1. Reconcile your code with others' changes Workaround 1. Save YOUR changes to a separate text file 2. Delete the project from your k.lab & User/GIT folder 2. Save the merged file 3. Team Add to index Discard your changes 1. Right click on the project: Replace with HEAD Revision. 2. Start over Team Push to Upstream 3. Import the project Add your changes. Go to the Commit stage 51

52 52

A BASIC UNDERSTANDING OF VERSION CONTROL

A BASIC UNDERSTANDING OF VERSION CONTROL DID YOU EVER DO THIS? DID YOU EVER DO THIS? DID YOU EVER DO THIS? DID YOU EVER DO THIS? DID YOU EVER DO THIS? DID YOU EVER DO THIS? DID YOU EVER DO THIS? DID YOU