Branch Create another line of development The branch operation is what you use

Branch create another line of development the branch

This preview shows page 31 - 42 out of 115 pages.

Branch :Create another line of development. The branch operation is what you use when you want your development process to fork off into two different directions. For example, when you release version 3.0, you might want to create a branch so that development of 4.0 features can be kept separate from 3.0.x bug-fixes. Merge: Apply changes from one branch to another. For example, if you created a branch for 3.0.x bug-fixes, you probably want those bug-fixes to happen in the main line of development as well. Without the merge operation, you could still achieve this by manually doing the bug-fixes in both branches. Merge makes this operation simpler by automating things as much as possible. Essential version control concepts… 1-Feb-20 CSI ZG514 Intro to Devops 31
Image of page 31
BITS Pilani, Pilani Campus create an empty repository and the create a new file myprog.c and checked it in. 1-Feb-20 CSI ZG514 Intro to Devops 32 Concepts- Getting files in and out of repository
Image of page 32
BITS Pilani, Pilani Campus Use the add operation when you have a file or directory in your working copy that is not yet under version control and you want to add it to the repository. The item is not actually added immediately. Rather, the item becomes part of the pending changeset, and is added to the repository when you commit. In Distributed Version Control, there's usually a concept between your file system and the repository that's called the staging area. So, when you actually do an add, the files go from your working set into the staging area and then from the staging area into the repository (Commit). Concepts Getting files in and out of repository 1-Feb-20 CSI ZG514 Intro to Devops 33
Image of page 33
BITS Pilani, Pilani Campus File2 is locked , like image file so that no one edit Concept - Check-out 1-Feb-20 CSI ZG514 Intro to Devops 34
Image of page 34
BITS Pilani, Pilani Campus Concept-Saving changes 1-Feb-20 CSI ZG514 Intro to Devops 35
Image of page 35
BITS Pilani, Deemed to be University under Section 3 of UGC Act, 1956 each item in the history will show you not only what is changed between one version and the other, it will also show you who made the changes, and what that person said about those changes. In this case, initial commit, adding D, deleting B, and so forth. Concept-History 1-Feb-20 CSI ZG514 Intro to Devops 36
Image of page 36
BITS Pilani, Deemed to be University under Section 3 of UGC Act, 1956 you can see here in the stack of files we have on the left that when we added feature C that created changeset number 23. So at anytime you can say, hey, I want to roll back to that particular changeset, and you tell it to revert to changeset 23. Concept-Revert/Rollback 1-Feb-20 CSI ZG514 Intro to Devops 37
Image of page 37
BITS Pilani, Deemed to be University under Section 3 of UGC Act, 1956 Concepts-Tag 1-Feb-20 CSI ZG514 Intro to Devops 38
Image of page 38
BITS Pilani, Deemed to be University under Section 3 of UGC Act, 1956 Branching – new path of development feature1 branch 1-Feb-20 CSI ZG514 Intro to Devops 39
Image of page 39
BITS Pilani, Pilani Campus Merging 1-Feb-20 CSI ZG514 Intro to Devops 40
Image of page 40
BITS Pilani, Pilani Campus The main branch all have exactly the same code, because they've all been integrated together through a series of reverse integrations and forward integrations. Large
Image of page 41
Image of page 42

You've reached the end of your free preview.

Want to read all 115 pages?

  • Winter '19
  • Revision control, Pilani Campus

  • Left Quote Icon

    Student Picture

  • Left Quote Icon

    Student Picture

  • Left Quote Icon

    Student Picture