Practical
Bitbucket (and git)
Workshop
Agenda
PART I (Tsachi)
Dev Flow, PR Merge strategies
PART II (Amir)
Tips for working locally (hands-on)
Development Workflow
-
Create a new feature branch from master
-
Add commits to feature branch
-
Optionally sync with master
-
Create a PR for feature branch
-
Optionally add more commits to feature branch
-
Merge to master from bitbucket UI
Merging a Pull Request
Why should I care??
Fast-Forward
Merge, Rebase & Squash
Which should I choose?
Rebase
(Tell the story of your project)
VS
Merge
(Log what actually happened)
