Git with bitbucket
Download as KEY, PDF2 likes3,195 views
Bitbucket is a hosting site for Git and Mercurial repositories that allows for effective collaboration without requiring a centralized server. While Git does not require a central server, it is good to have Bitbucket to host code repositories. Git uses a distributed version control system that allows developers to directly exchange changes and work independently of network access. Benefits of using Git with Bitbucket include free hosting for academic users, the ability to work offline or on planes, and fast branching and merging of code.
Ad
More Related Content
What's hot (20)
Viewers also liked (20)
Ad
Similar to Git with bitbucket (20)
Ad
More from Sumin Byeon (15)
![PyCon 2017 프로그래머가 이사하는 법 2 [천원경매]](https://cdn.slidesharecdn.com/ss_thumbnails/pycon20172-170813134610-thumbnail.jpg?width=560&fit=bounds)
![[야생의 땅: 듀랑고] 지형 관리 완전 자동화 - 생생한 AWS와 Docker 체험기](https://cdn.slidesharecdn.com/ss_thumbnails/ndc2016-160426115105-thumbnail.jpg?width=560&fit=bounds)
![[야생의 땅: 듀랑고]의 식물 생태계를 담당하는 21세기 정원사의 OpenCL 경험담](https://cdn.slidesharecdn.com/ss_thumbnails/ndc2015-150521082100-lva1-app6891-thumbnail.jpg?width=560&fit=bounds)
Recently uploaded (20)
Git with bitbucket
- 1. Git with Bitbucket Sumin Byeon SmarTrek
- 2. Bitbucket • Hosting site for Git and Mercurial repositories • Not to be confused with a version control system • Not a necessity, but good to have for more effective collaboration
- 3. Centralized Version Control
- 4. Centralized Version Control • Subversion, CVS, etc. • Everything goes to the server; users commit changes to the sever, checkout the latest revision from the server. • No direct exchange between developers
- 5. Distributed Version Control
- 6. Distributed Version Control • Git, Mercurial, Bazaar, etc. • Each copy of repository is identical and self-sufficient • No need for a central server, but one may choose to have one • Developers may directly exchange changesets over Wi-Fi at a local coffee shop
- 7. Git • Distributed version control system • Super fast • Space efficient • Independent of network access or a central server • Superior branching and merging mechanism • Various protection devices against corruption
- 8. Benefits • Bitbucket is completely free if you have a .edu email address • Since Git does not requires a central server, we can even work in an airplane • Slave-driver-type supervisors (e.g., Dr. Chiu) will love this • Given the nature of our development team, we can’t fully take advantage of all the benefits of Git, but we use it mainly for its speed and ease of branching and merging.
- 9. Workflow • Git does not impose any particular workflow, but this is the usual workflow for our Android repository. • Pull • Branch and merge • Commit changes • Push
- 10. What To Store • Source code • Binary resources (e.g., images, sounds, etc.) • Build scripts • Documents (e.g., README, LICENSE) • Unit tests • Anything that constitutes a project
- 11. What Not To Store • Anything that can be synthesized • Compiled binary, automatically generated code (e.g., R.java for Android) • Personal preference configuration files • .gitignore file contains a list of files that will be ignored by Git
- 12. Branches And Tags • Branch is basically a reference to a particular commit • Automatically updated whenever a commit is made to that branch • Tag marks a particular commit • May be moved manually
- 13. Merging •$ git branch * master experimental •$ git merge experimental • Merge may fail due to conflicts
- 14. Conflict Resolution <<<<<<< HEAD:file.txt Hello world ======= Goodbye >>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt • Must be resolved manually • Commit merged code when you are done
- 15. Emergency Kits • Before you have committed •$ git reset HEAD ${filename} •$ git checkout -- ${filename} • After you have committed •$ git revert HEAD •$ git commit --amend
- 16. Questions?