Introduction
Yannick et Benjamin reçoivent Xavier Gouchet, auteur de AutoMergeTool, pour parler de Git et des conflits lors des merges.
Show notes
1:23″ – Workwell : https://www.workwell.io/
2:30″ – Deezer : https://www.deezer.com/fr/
2:50″ – Dropbox : https://www.dropbox.com/
3:43″ – CVS : https://fr.wikipedia.org/wiki/Concurrent_versions_system
3:44″ – SourceSafe : https://fr.wikipedia.org/wiki/Microsoft_Visual_SourceSafe
3:47″ – Mercurial : https://fr.wikipedia.org/wiki/Mercurial
3:52″ – Perforce : https://www.perforce.com/
3:53″ – SVN : https://fr.wikipedia.org/wiki/Apache_Subversion
3:58″ – Git : https://fr.wikipedia.org/wiki/Git
4:10″ – Linus Torlvads : https://fr.wikipedia.org/wiki/Linus_Torvalds
4:26″ – Linux : https://fr.wikipedia.org/wiki/Linux
4:49″ – Elon Musk : https://fr.wikipedia.org/wiki/Elon_Musk
6:10″ – Git blame : https://git-scm.com/docs/git-blame
8:50″ – Annotate dans Android Studio : https://www.jetbrains.com/help/idea/investigate-changes.html#annotate
11:26″ – Rebase : https://git-scm.com/docs/git-rebase
11:27″ – Merge : https://git-scm.com/docs/git-merge
14:01″ – Octopus merge : https://git-scm.com/docs/git-merge#git-merge-octopus
14:05″ – Octocat : https://assets-cdn.github.com/images/modules/logos_page/Octocat.png
24:21″ – AutoMergeTool : https://github.com/xgouchet/AutoMergeTool
28:49″ – Meld : http://meldmerge.org/
28:50″ – SourceTree : https://www.sourcetreeapp.com/
28:52″ – WinMerge : http://winmerge.org/?lang=fr
31:24″ – Git pull : https://git-scm.com/docs/git-pull
31:43″ – Git mergetool : https://git-scm.com/docs/git-mergetool
32:14″ – Git config : https://git-scm.com/book/fr/v1/D%C3%A9marrage-rapide-Param%C3%A9trage-%C3%A0-la-premi%C3%A8re-utilisation-de-Git
36:45″ – TensorFlow : https://www.tensorflow.org/
37:40″ – Git rerere : https://git-scm.com/docs/git-rerere
42:00″ – pip : https://docs.python.org/2/installing/
42:55″ – PM qui cherche une star d’UX : https://twitter.com/xgouchet/status/951416455660294145
44:17″ – Doc d’AutoMergeTool : http://automergetool.readthedocs.io/en/stable/
45:22″ – Hacktoberfest : https://hacktoberfest.digitalocean.com/
46:40″ – project.pbxproj : https://fileinfo.com/extension/pbxproj
54:53″ – Android Makers : http://androidmakers.fr
54:56″ – Droidcon London : http://droidcon.co.uk
55:01″ – Talk de Xavier sur AutoMergeTool à la Droidcon : https://skillsmatter.com/skillscasts/10557-merge-like-it-s-2099
55:25″ – Talk de Xavier sur AutoMergeTool à la Android Makers : https://www.youtube.com/watch?v=C9HYMqm3zRM
58:46″ – Git alias : https://git-scm.com/book/tr/v2/Git-Basics-Git-Aliases
59:22″ – force-with-lease : https://git-scm.com/docs/git-push#git-push—no-force-with-lease
1:01:31″ – Fixup : http://fle.github.io/git-tip-keep-your-branch-clean-with-fixup-and-autosquash.html
1:03:39″ – git remote show origin : https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes
1:04:15″ – git reset –soft HEAD~1 : https://git-scm.com/docs/git-reset
1:04:53″ – git stash : https://git-scm.com/docs/git-stash
1:07:25″ – ZSH : https://doc.ubuntu-fr.org/zsh
1:07:31″ – Fish : https://fishshell.com/
1:08:03″ – Oh-My-ZSH : https://github.com/robbyrussell/oh-my-zsh
1:09:03″ – Prompt : https://en.wikibooks.org/wiki/Guide_to_Unix/Explanations/Shell_Prompt#Appearance_of_the_prompt
1:10:17″ – Gist : https://gist.github.com/
1:11:24″ – Git Flow : https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
1:11:59″ – Jira : https://fr.atlassian.com/software/jira
1:12:04″ – Stash / BitBucket : https://bitbucket.org/
1:14:03″ – Template custom : https://www.jetbrains.com/help/idea/creating-and-editing-file-templates.html
1:15:03″ – Mockito : http://site.mockito.org/
1:15:20″ – Kotlin-Mockito : https://github.com/nhaarman/mockito-kotlin
1:15:45″ – Article sur le fond noir vs le fond blanc : https://ux.stackexchange.com/a/53268
1:19:53″ – CFP d’Android Makers : https://cfp.androidmakers.fr
