VirtualTam's bookmarks

1. Practical Electronics Archive | Electronics Magazine from the UK starting in 1964 2023-06-05

   tags: diy, electronics, magazine

   [ permalink ]

   Practical Electronics began publication in the UK in December,1964 and was aimed at the experimenter and construction enthusiast.

   In November, 1992 Practical Electronics merged with Everyday Electronics to become Everyday Practical Electronics.

2. Shader Integration: Merging Shading Technologies on the Nintendo Gamecube 2022-06-04

   tags: graphics/3d, graphics/shader, nintendo/gamecube

   [ permalink ]
3. Git - Subtree Merging 2018-11-30

   tags: directory, merge, repository, source-code-management/git

   [ permalink ]

   • https://stackoverflow.com/questions/6426247/merge-git-repository-in-subdirectory
   • https://stackoverflow.com/questions/1683531/how-to-import-existing-git-repository-into-another
4. Git - Merge and/or Rebase workflows 2017-10-26

   tags: branch, merge, rebase, source-code-management, source-code-management/git

   [ permalink ]

   • https://www.atlassian.com/git/tutorials/merging-vs-rebasing
   • https://stackoverflow.com/questions/804115/when-do-you-use-git-rebase-instead-of-git-merge
   • https://medium.com/bekk/why-you-should-stop-using-git-rebase-5552bee4fed1
   • https://medium.com/@porteneuve/getting-solid-at-git-rebase-vs-merge-4fa1a48c53aa
5. Git - git-merge-base Documentation 2017-10-16

   tags: branch, common, merge, source-code-management/git

   [ permalink ]

   • https://stackoverflow.com/questions/1549146/find-common-ancestor-of-two-git-branches#1549155
6. Fix conflicts only once with git rerere 2015-06-11

   tags: conflict, diff, merge, rebase, source-code-management/git

   [ permalink ]

   Original article: http://www.git-attitude.fr/2014/11/04/git-rerere/ Official doc: http://git-scm.com/docs/git-rerere

7. Diffuse - Portable merge tool 2014-12-04

   tags: control, file, merge, revision, source-code-management/git, source-code-management/subversion, version

   [ permalink ]
8. Git 2.0 - Les 10 commandements 2014-06-03

   tags: code, control, development, source-code-management/git, system, version

   [ permalink ]

   1er commandement: "Du contrôle de version, tu te soucieras" http://s3.media.squarespace.com/production/2129687/19317774/.a/6a00d8341d3df553ef017c330f2ae8970b-pi

   2ème commandement: "avec Git, tu te formeras, sinon sous SVN tu resteras" http://s3.media.squarespace.com/production/2129687/19317774/.a/6a00d8341d3df553ef017743a87369970d-pi

   3ème commandement: "Le merge, tu éviteras tant que faire se peut" http://geekandpoke.typepad.com/geekandpoke/2010/10/being-a-code-made-easy-chapter-1.html

   4ème commandement: "De versionner n'importe quoi, tu t'abstiendras" http://geek-and-poke.com/geekandpoke/2012/11/7/simply-explained.html

   5ème commandement: "Un commit réécrit, tu ne pusheras point" http://geek-and-poke.com/geekandpoke/2014/3/3/end-of-working-day

   6ème commandement: "Avant de tester, tu ne pusheras point" http://geek-and-poke.com/geekandpoke/2013/5/31/finally-its-friday

   7ème commandement: "le 6eme commandement tu appliqueras, ou ton chef te châtiera" http://geek-and-poke.com/geekandpoke/2013/11/24/simply-explained

   8ème commandement: "Tu ne tricheras point" http://geek-and-poke.com/geekandpoke/2013/7/28/tdd

   9ème commandement: ""Des tags tu abuseras" http://geek-and-poke.com/geekandpoke/2013/12/26/games-for-the-real-geeks

   10ème commandement: "Ton Dieu Jenkins tu honoreras et ton salut tu trouveras" http://geek-and-poke.com/geekandpoke/2013/8/10/the-little-miracles