© INNOVEO SOLUTIONS AG /Developing skye editorProcesses and Tooling30.04.2013Laurent Kempé
© INNOVEO SOLUTIONS AG /01 May 2013 2 Git refresh What is Git Git Benefits Skye Editor Process Tooling Git Demo Nex...
© INNOVEO SOLUTIONS AG /01 May 2013 3 Distributed Version Control System Decentralized but centralized central “truth” ...
© INNOVEO SOLUTIONS AG /01 May 2013 4 Two phase commit Stage/Commit, Push Local history / branching No connection to c...
© INNOVEO SOLUTIONS AG /01 May 2013 503 SKYE EDITOR PROCESS /Jira TicketOK?Git FeatureBranch QAStart progress Feature Edit...
© INNOVEO SOLUTIONS AG /01 May 2013 6 Atlassian, JetBrains, Github, Innoveo04 TOOLING /SUPPORTING OUR PROCESS
© INNOVEO SOLUTIONS AG /01 May 2013 7 Start progress on jira Git branch –a & Git lg Create a feature branch SKYE-718-Pr...
© INNOVEO SOLUTIONS AG /01 May 2013 8 Git Feature branches Monitors a set of branches Reduce management pain06 TEAM CIT...
© INNOVEO SOLUTIONS AG /01 May 2013 9ProjectsBrowsing filesCommitsPull Request07 STASH /
© INNOVEO SOLUTIONS AG /01 May 2013 10Centralize the communicationAutomate processes08 HIPCHAT & HUBOT /
© INNOVEO SOLUTIONS AG /01 May 2013 11Command line Local feature branch Commit and show TeamCity integration Interacti...
© INNOVEO SOLUTIONS AG /01 May 2013 1210 NEXT /YOUR TURN
Upcoming SlideShare
Loading in …5
×

Processes & tooling to develop the editor

339 views
239 views

Published on

Published in: Technology
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
339
On SlideShare
0
From Embeds
0
Number of Embeds
8
Actions
Shares
0
Downloads
1
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide
  • Be asynchronous - http://zachholman.com/posts/how-github-works-asynchronous/
  • Processes & tooling to develop the editor

    1. 1. © INNOVEO SOLUTIONS AG /Developing skye editorProcesses and Tooling30.04.2013Laurent Kempé
    2. 2. © INNOVEO SOLUTIONS AG /01 May 2013 2 Git refresh What is Git Git Benefits Skye Editor Process Tooling Git Demo Next02 AGENDA /
    3. 3. © INNOVEO SOLUTIONS AG /01 May 2013 3 Distributed Version Control System Decentralized but centralized central “truth” repo 2 Phase commit Cheap and easy branchesand pain-free merges Git, Mercurial…01 WHAT IS GIT /OVERVIEW
    4. 4. © INNOVEO SOLUTIONS AG /01 May 2013 4 Two phase commit Stage/Commit, Push Local history / branching No connection to central repo needed to branch/to look at history Smarter Merging Git‟s focus on file content rather than file location Better at resolving merge conflicts for you (e.g. renames) Branching/Merging is daily workflow no anymore an „exceptional case‟ Experiment / Refactoring / Spikes Commit changes on one path, if wrong rollback Stash changes Rebase / Rewriting history Until push you can use interactive rebase02 GIT BENEFITS /AS A DEVELOPER
    5. 5. © INNOVEO SOLUTIONS AG /01 May 2013 503 SKYE EDITOR PROCESS /Jira TicketOK?Git FeatureBranch QAStart progress Feature Editor buildDevelopNoPull RequestYesDistribute toTeamFeedbackClosePre-Release Editor build• Parallel work• Asynchronous communication• Short feedback loop• Shippable after each backlog
    6. 6. © INNOVEO SOLUTIONS AG /01 May 2013 6 Atlassian, JetBrains, Github, Innoveo04 TOOLING /SUPPORTING OUR PROCESS
    7. 7. © INNOVEO SOLUTIONS AG /01 May 2013 7 Start progress on jira Git branch –a & Git lg Create a feature branch SKYE-718-ProcessesToolingDemo Commit Rebase -i Push –u origin SKYE-718-ProcessesToolingDemo TeamCity & Dropbox builds HipChat Git and TeamCity integration Stash build status Skye editor build Create a merge branch for SKYE-718-MERGE-ProcessesToolingDemo for Pull Request Stash Commits Browsing files Pull request Projects TeamCity & GitExtensions result of Pull Request Git bisect05 DEMO/WHOLE ROUNDTRIP DEMO
    8. 8. © INNOVEO SOLUTIONS AG /01 May 2013 8 Git Feature branches Monitors a set of branches Reduce management pain06 TEAM CITY /Continuous Integration FeatureBranchesContinuous Integration Master Branch Manual Release•Monitor and build on Feature branches•Build & publish in Release compilation Mode•Publish artifact with a version 9.9.9.x toFeature folder•Monitor and build on Master branch•Build & publish in Release compilation Mode•Publish artifact with a version 2.26.0.x toDevelopment folder•No monitoring only manual•No compilation•Copy artifact with a version 2.26.0.x fromDevelopment folder to Release folder•Tag release in Git
    9. 9. © INNOVEO SOLUTIONS AG /01 May 2013 9ProjectsBrowsing filesCommitsPull Request07 STASH /
    10. 10. © INNOVEO SOLUTIONS AG /01 May 2013 10Centralize the communicationAutomate processes08 HIPCHAT & HUBOT /
    11. 11. © INNOVEO SOLUTIONS AG /01 May 2013 11Command line Local feature branch Commit and show TeamCity integration Interactive rebase Push BisectGitextensionsSourcetreeIntellij09 GIT /
    12. 12. © INNOVEO SOLUTIONS AG /01 May 2013 1210 NEXT /YOUR TURN

    ×