Sep 26, 2016
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
http://in.relation.to/2010/10/13/hibernate-moves-to-git-git-tips-and-tricks/
The tab vs spaces war ?
Mozilla is slower with tabs bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1154339