Git and Github at organizations

NOTICE: Propriety and Conﬁden5al This material is propriety to Shopsense.
IT contains trade secrets and conﬁden5al informa5on which is sole propriety of Shopsense. This material is solely for Clients internal use. This material shall not be used, reproduced, copied, disclosed, transmiBed, in whole or in part, without the express wriBen consent of Shopsense 2013 Shopsense Retail Technologies. All rights reserved. www.shopsense.co [email protected] @ShopsenseCo © Development @ Shopsense From coding prac5ces to code management Tuesday, 13 August 13

2013 Shopsense Retail Technologies. Conﬁden5al document, not for
circula5on. All rights reserved © Agenda 2 • Organiza5on • Code Management • Version Controlling • Release Management • Tes5ng • PaBerns • Git Internals Tuesday, 13 August 13

circula5on. All rights reserved © 5 Organiza5on • Team Account on GitHub • Owners • Developers • Designers • Various Access privileges Push, Pull & Administra5on ➜ Push, Pull ➜ Pull ➜ Tuesday, 13 August 13

circula5on. All rights reserved © 9 Code Review • Get reviewed, whatever you are pushing • Called Pull Request on Github • Nothing should go to master without Code Review master feature pull request Tuesday, 13 August 13

circula5on. All rights reserved © 10 Code Review • Get reviewed, whatever you are pushing • Called Pull Request on Github • Nothing should go to master without Code Review master feature pull request Why? • Two be7er than one • Maintain Hygiene • Maintain Best Prac@ces, Standards Tuesday, 13 August 13

circula5on. All rights reserved © 11 Code Review • Get reviewed, whatever you are pushing • Called Pull Request on Github • Nothing should go to master without Code Review Why? • Two be7er than one • Maintain Hygiene • Maintain Best Prac@ces, Standards master feature pull request Why Not? • Fault ﬁnding • Revenge Tuesday, 13 August 13

circula5on. All rights reserved © 12 Code Review • Get reviewed, whatever you are pushing • Called Pull Request on Github • Nothing should go to master without Code Review Why? • Two be7er than one • Maintain Hygiene • Maintain Best Prac@ces, Standards master feature pull request Why Not? • Fault ﬁnding • Revenge End the Pull Request with a :shipit: emoCcon Tuesday, 13 August 13

circula5on. All rights reserved © 13 Code Review • Get reviewed, whatever you are pushing • Called Pull Request on Github • Nothing should go to master without Code Review Why? • Two be7er than one • Maintain Hygiene • Maintain Best Prac@ces, Standards master feature pull request Why Not? • Fault ﬁnding • Revenge End the Pull Request with a :shipit: emoCcon Tuesday, 13 August 13

circula5on. All rights reserved © • Major.Minor.Revision • Tags for Releasable Versions • Whenever you commit to master • Log your commits to change-‐list • git log v0.1.2..HEAD >> changelist.log Versioning Tuesday, 13 August 13

circula5on. All rights reserved © Automate! 16 Versioning • Major.Minor.Revision • Tags for Releasable Versions • Whenever you commit to master • Log your commits to change-‐list • git log v0.1.2..HEAD >> changelist.log Tuesday, 13 August 13

circula5on. All rights reserved © 18 Release Management • Master to staging every week • Dog fooding -‐ You are the dev and you’re the QA! • When ready for produc5on, tag master to a release • GitHub Releases maps a release to a git tag Tuesday, 13 August 13

circula5on. All rights reserved © 20 when do .. you are working on a branch and you see something broken in master .. commit/stash changes in your current branch ‘b’, create a new branch from master ‘n’. Fix bug, raise PR. When ‘n’ is merged in master, rebase ‘b’ .. you are working on a branch ‘a’ but cannot merge it right now. But you want to work on a feature that relies on changes in branch ‘a’. .. create a branch ‘b’ from ‘a’. Once ‘a’ is merged into master, rebase ‘b’ against master. Resolve conﬂicts (an5cipate many of them) .. you are making some changes which you think doesn’t really need a PR. For example; indenta5on or spelling error ﬁx .. create a PR, assign it to yourself, make a comment and close it yourself. .. you want to prototype and get feedback on your idea .. clone the repo, make branches, perfect the code, test it and submit a PR Best Practices Tuesday, 13 August 13

circula5on. All rights reserved © 36 Staging Local Git DB Working Directory REMOTE git add git commit git push origin .. git pull / fetch git checkout / merge How Git works? Local-‐Staging-‐Produc5on Tuesday, 13 August 13

circula5on. All rights reserved © Coding Style Guide 48 Python h7p://www.python.org/dev/peps/pep-‐0008/ R h7p://google-‐styleguide.googlecode.com/svn/trunk/Rguide.xml ObjecCve C h7p://google-‐styleguide.googlecode.com/svn/trunk/objcguide.xml JavaScript h7p://google-‐styleguide.googlecode.com/svn/trunk/javascriptguide.xml CPP h7p://google-‐styleguide.googlecode.com/svn/trunk/cppguide.xml C h7p://www.maultech.com/chrislo7/resources/cstyle/Peter_CStyleGuide.pdf C# / Java h7p://www.shopsense.co/wiki/index.php?@tle=User_talk:Rajat Tuesday, 13 August 13

circula5on. All rights reserved © Editors and IDE’s and Tools 49 Python Aptana SCM Git, GitHub Database MySQL, SQLite Database Client Sequel Pro, SQL Yogi StaCsCcs R HTML / JS / CSS Aptana C# Visual Studio ObjecCve C XCode Java Eclipse C / C++ Netbeans QT QT Editor Tuesday, 13 August 13

Git and Github at organizations

Git and Github at organizations

More Decks by Jayesh

Other Decks in Technology

Featured

Transcript