Shows
ReadOrListenGit Pull Causes a MergeAuthor: Lorna Jane Mitchell
Read By: Lorna Jane Mitchell
Original Source: http://www.lornajane.net/posts/2015/git-pull-causes-a-merge
If you type git pull and expect a fast-forward update, but get a merge instead, don't panic! This usually happens when we're collaborating on a branch with other people, and we've made changes on our local version of a branch, and someone else (or the other you, if you use git to sync between multiple dev platforms) has made changes to the remote version of a branch in the meantime. It also happens really frequently in...2016-01-2403 min
ReadOrListenUsing Composer Without GitIgnoring Vendor/Author: Lorna Jane Mitchell
Read By: Lorna Jane Mitchell
Original Source: http://www.lornajane.net/posts/2014/using-composer-without-gitignoring
Recent additions to the joind.in API have introduced some new dependencies so we decided we'd start using Composer to manage these - but we don't want to run composer unsupervised. I'm sure this will bring the rain of "just run composer install, it's probably mostly almost safe" criticism, but actually it's quite tricky to run Composer without excluding vendor/ from source control so I thought I'd share how we did it so that anyone who...2016-01-2103 min