Jboss Community Asylum

JBoss Asylum 42 Shownotes Recorded 21st September 2016 by Emmanuel Bernard (Info, @emmanuelbernard) & Max Rydahl Andersen (Info, @maxandersen) Andrew Lee Rubinger (Info, @ALRubinger)   Music by Real Rice (http://www.jamendo.com/en/track/24321) Licence Art Libre 1.3   #42: I Git the flow Give feedback at @jbossasylum and asylum@jboss.org   The Tweet: https://twitter.com/alrubinger/status/718527667268505600   Merge vs rebase, Good background: https://www.atlassian.com/git/tutorials/merging-vs-rebasing/ When using merge `git log --no-merges` is your friend.   Monorepo: https://danluu.com/monorepo/ Still stuck on svn ?    https://github.com/maxandersen/jbosstools-gitmigration    http://www.slideshare.net/maxandersen/a-tale-about-a-big-svn-to-git-migration https://emmanuelbernard.com/blog/2010/05/31/git-how-my-life-has-improved-since-last-month-when-i-used-svn/ http://in.relation.to/2010/10/13/hibernate-moves-to-git-git-tips-and-tricks/   The tab vs spaces war ? https://medium.com/@hoffa/400-000-github-rep