How To Use Git. Advanced: Tags & Branches. Mary Kate Trost July 8, 2011

Size: px

Start display at page:

Download "How To Use Git. Advanced: Tags & Branches. Mary Kate Trost July 8, 2011"

Erica Williamson
6 years ago
Views:

1 How To Use Git Advanced: Tags & Branches Mary Kate Trost July 8, 2011

2 Create a Version (Tags) When releasing, want to mark that version so you can go back to it Create a tag git tag -a tagname -m 'tag description' Example: git tag -a v1.1 -m 'version 1.1 contains the first version' Tuesday, June 7, of 29

3 Git Tags List tags git tag git tag -l v1.1.* Get info on a tag git show tagname Push to remote Not automatically pushed to the remote git push origin tagname Tuesday, June 7, of 29

4 Branching Start from a certain version and make modifications separate from the main version Allows you to develop changes and store intermediate files prior to putting them in the version everyone else sees (a form of backup) Allows you to collaborate with a couple people without affecting everyone else See what branches there are $ git branch git branch master * pileup Current branch marked with '*' Tuesday, June 7, of 29

5 Branch Concept Create and switch to new branch called testing Tuesday, June 7, 2011 From: 5 of 29

6 Branch Concept Create and switch to new branch called testing Commit a change on the new branch Tuesday, June 7, 2011 From: 6 of 29

7 Branch Concept Create and switch to new branch called testing Commit a change on the new branch Move back to master (default) branch Tuesday, June 7, 2011 From: 7 of 29

8 Branch Concept Create and switch to new branch called testing Commit a change on the new branch Move back to master (default) branch Commit a change to master Tuesday, June 7, 2011 From: 8 of 29

9 Switching Branches Uncommitted changes will end up in the new branch Commit everything that goes in the current branch before switching Branch checkout fails if uncommitted changes conflict with the branch git checkout -b branchname Creates starting from the currently checked out branch May need to switch branches before creating a new one git checkout branchname Create a branch and switch to it Switch to an existing branch 9 of 29

10 Branch Merging Checkout the branch you want to merge into git checkout branchmergeinto Often: git checkout master Merge the other branch into it git merge branchmergingfrom Fast forward - no divergent work, just moves the pointer to the latest commit on the other branch 10 of 29

11 Branch Example 11 of 29

12 Branch Example Start work on issue #53 $ git checkout -b iss53 Switched to a new branch "iss53" 12 of 29

13 Branch Example Start work on issue #53 $ git checkout -b iss53 Switched to a new branch "iss53" 13 of 29

14 Branch Example Start work on issue #53 $ git checkout -b iss53 Switched to a new branch "iss53" Make changes & commit them $ git add modifiedfiles $ git commit -m describe partial updates for issue of 29

15 Branch Example Start work on issue #53 $ git checkout -b iss53 Switched to a new branch "iss53" Make changes & commit them $ git add modifiedfiles $ git commit -m describe partial updates for issue of 29

16 Branch Example Start work on issue #53 $ git checkout -b iss53 Switched to a new branch "iss53" Make changes & commit them $ git add modifiedfiles $ git commit -m describe partial updates for issue 53 Need to make a different fix based off master $ git checkout master Switched to branch "master" $ git checkout -b 'hotfix' Switched to a new branch "hotfix" Make changes & commit them $ git add modifiedfiles $ git commit -m 'fixed major issue' 16 of 29

commit them $ git add modifiedfiles $ git commit -m

different fix based off master $ git checkout master

Switched to a new branch "hotfix" Make changes & 'fixed

17 Branch Example Start work on issue #53 $ git checkout -b iss53 Switched to a new branch "iss53" Make changes & commit them $ git add modifiedfiles $ git commit -m describe partial updates for issue 53 Need to make a different fix based off master $ git checkout master Switched to branch "master" $ git checkout -b 'hotfix' Switched to a new branch "hotfix" Make changes & commit them $ git add modifiedfiles $ git commit -m 'fixed major issue' 17 of 29

18 Merge Example 18 of 29

19 Merge Example Merge hotfix to master $ git checkout master $ git merge hotfix Updating f42c576..3a0874c Fast forward of 29

20 Merge Example Merge hotfix to master $ git checkout master $ git merge hotfix Updating f42c576..3a0874c Fast forward of 29

21 Merge Example Merge hotfix to master $ git checkout master $ git merge hotfix Updating f42c576..3a0874c Fast forward... Done with hotfix branch, so delete it $ git branch -d hotfix Deleted branch hotfix (3a0874c). Switch back to in-work branch iss53 $ git checkout iss53 Switched to branch "iss53" Make more changes & commit $ git add changedfiles $ git commit -m 'finished description' 21 of 29

22 Merge Example Merge hotfix to master $ git checkout master $ git merge hotfix Updating f42c576..3a0874c Fast forward... Done with hotfix branch, so delete it $ git branch -d hotfix Deleted branch hotfix (3a0874c). Switch back to in-work branch iss53 $ git checkout iss53 Switched to branch "iss53" Make more changes & commit $ git add changedfiles $ git commit -m 'finished description' 22 of 29

23 Merge Example Merge hotfix to master $ git checkout master $ git merge hotfix Updating f42c576..3a0874c Fast forward... Done with hotfix branch, so delete it $ git branch -d hotfix Deleted branch hotfix (3a0874c). Switch back to in-work branch iss53 $ git checkout iss53 Switched to branch "iss53" Make more changes & commit $ git add changedfiles $ git commit -m 'finished description' Merge into master $ git checkout master $ git merge iss53 Merge made by recursive of 29

.. Done with hotfix branch, so delete it $ git branch -d hotfix Deleted branch hotfix (3a0874c).

changes & commit $ git add changedfiles $ git commit -m 'finished description' Merge into master

24 Merge Example Merge hotfix to master $ git checkout master $ git merge hotfix Updating f42c576..3a0874c Fast forward... Done with hotfix branch, so delete it $ git branch -d hotfix Deleted branch hotfix (3a0874c). Switch back to in-work branch iss53 $ git checkout iss53 Switched to branch "iss53" Make more changes & commit $ git add changedfiles $ git commit -m 'finished description' Merge into master $ git checkout master $ git merge iss53 Merge made by recursive.... Git automatically does a 3-way merge, using C2 (common ancestor), C4, & C5 into new commit, C6. 24 of 29

25 Merge Conflict Same part of the file modified, git needs your help! $ git merge iss53 Auto-merging index.html Merge conflict lets you resolve CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. $ git status index.html: needs merge # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # unmerged: index.html Git status indicates unmerged # <<<<<<< HEAD:index.html <div id="footer">contact : .support@github.com</div> ======= <div id="footer"> please contact us at support@github.com </div> >>>>>>> iss53:index.html <<<<<<< - start current branch's version ======= - separate's the 2 versions Conflicts are marked in the file >>>>>>> - end other branch's version 25 of 29

26 Resolving Merge Conflict Make appropriate changes Delete the <<<<<<<, =======, and >>>>>>> Add to the staged files git add nowmergedfile Commit the merge git commit Update the default merge message with a description of how you resolved the merge You can also use a mergetool: git mergetool 26 of 29

27 Sharing Branches Like tags not automatically pushed git push origin branchname Only needed once To see all branches including remotes: git branch -a Base work on a remote branch/merge back to it git checkout --track origin/branchname Only needed once Creates & checkouts branch called branchname Now push & pull from your branchname Tuesday, June 7, of 29

28 Cleaning up Branches Delete branch after merging & you are done with it git branch -d branchname Make sure you have merged first! Delete remote branch: git push origin :branchname Tuesday, June 7, of 29

29 Resources Tuesday, June 7, of 29

Git Branching. Chapter What a Branch Is

Git Branching. Chapter What a Branch Is Chapter 3 Git Branching Nearly every VCS has some form of branching support. Branching means you diverge from the main line of development and continue to do work without messing with that main line. In