Coding is simple and great if it's just you working on the code. It is getting much more complex when a whole team or even several teams are working on the code base. You want to be sure, that everybody knows about code changes, the quality is the same all over the code base and a merge shouldn't stop the whole team from working. Atlassian's tools can help you out. This presentation shows how you can use Stash and Bamboo to happily code together in a team. You don't have to worry about broken builds on your master branch or that your graduate accidentally merges his changes that get automatic deployed. Everybody understands each part of the code base and the code got reviewed before it hits your master branch.

1. We C de T gether

2. Sven Peters
Happy Ambassador
@svenpet
http://svenpet.com

3. Life
as a
Hackerreat !
g is

4. Simple Workflow!
writing code
committing code

5. Simple dependencies!
stops just you
... so what?
writing code
breaking code
fixing code

6. Code Quality
like code

7. Lonesome Cowboy

8. The trouble starts
with the team

9. Life
as a
Team
Coder

10. Multiple changes!
writing code
merging code
changing code

11. Rely on each other!
stops the team
writing code
breaking code
fixing code fast

12. Code Quality!
writing code Opinion
reviewing code
Opinion
Opinion

13. It's not your code
team's code
It's your

14. ge th elp
C
T GETHER
D
E

15. C
T GETHER
D
E
Bringing code together
Sharing code with others
Protecting your code

16. C
T GETHER
D
E
Bringing code together

17. Branching
is cool!

18. MERGE
HELL

19. everybody stops to work until merge is done
Merge Fear
Disease
afraid that the build will fail
waiting until the code is done done

20. A branch
for every task

21. Branches
have short lives
~ 2 days

22. S r oc ks
DVC
Git
Mercurial

23. f ind o ut!
Will the build fail
if I would merge now?
... and stop the rest of the team!

24. f ind o ut!

25. r an ch es
pl an b

26. co mm it
vi rtu al

27. Bamboo

28. C
T GETHER
D
E
Sharing code with others

29. Do you have such a team member?
I've written that
code. It's faster
when I just fix it. I can't tell you how
this works.
It's too complicated.
This is a very sensitive
area... You can easily
break things

30. Do you have such a team member?
I want to protect
my job!

31. Do you have such a team member?
Fire
him !

32. feel better Learn
Discuss your code changes
Better
quality

33. Re que sts
us eP ull
Discuss your code changes
before
they get merged!

34. Re que sts
us eP ull
create
what do
you think?

35. Re que sts
us eP ull
invite
what do
you think?

36. Re que sts
us eP ull ve
appro
ss &
di scu
what do
you think?

37. Re que sts
us eP ull
me rge
what do
you think?

38. Re que sts
us eP ull
n vo lve
i
I know @Ben has
already written an
algorithm for that

39. Dem Time

41. Share and Collaborate
on Code is grea t!

42. Share and Collaborate
on Code be e as yand fast
ould
sh

43. Simple Workflow
Merge
Pull
Request
Branch

44. Simple Workflow
No Roles
Merge
Pull
Request
Branch

45. C
T GETHER
D
E
Protecting your code

46. Simple Workflow
No Roles
Merge
Pull
Request
Branch

47. Simple Workflow
No Roles
Merge
Pull
Request
Branch

48. Simple Workflow
Some Roles
Merge
Pull
Request
Branch

49. Do you want your graduates
merge into the automatic deploy branch?

50. Branch Permissions

51. Project Permissions
Project Project
Wonderland Fairytale

52. Security DevSpeed

53. The Repo Guard
Bew are

54. Can I get a new Repository?
Please!

55. Can I get a new Repository?
I'll do in 3
days

56. Create Repository

57. C
T GETHER
D
E