A copy merge is basically where you take all of their changes. Say you’re in branch A and want to merge in branch B. Their might be conflicts, but you don’t care, as you want whatever is in branch B. Almost as if you are copying from B to A. Since you are in branch A, it is referred to as ours. Branch B is referred to as theirs. In git land, you can do this, assuming you are in branch A: git merge -s recursive --strategy-option theirs B This w...
Verbose Logging
software development with some really amazing hairRewrite Git History for Make Benefit of Glorious Internet Tubes of the World
Sometimes you do silly things. Like check big binary files into source control. Ones that shouldn’t be in source control. This causes problems. Okay, well not really problems, but it has some effects. Cloning the repository takes longer, of course, since there are big files, and other operations can take longer too. But fret not! If you need to purge files from Git, you can. Now, you can’t just remove the file, since it’s still technically in ...
Read the full article
Why the Github's really are better than the cvsdude's
There are a lot of hosted source control providers out there. Github, bitbucket, cvsdude, ProjectLocker, Codaset, SourceForge, Codeplex, Google Code, Beanstalk, and I could probably keep going until all 5 of you stopped reading my blog. Personally, I’m a Github kind of guy. From the looks of things, I would also enjoy Codaset or bitbucket. We use cvsdude at CodeBaby, and while it gets the job done, it’s not something I’d use otherwise. First, ...
Read the full article
Git things I always forget
Create a branch locally, and push it to origin: git checkout -b branchnamegit push origin branchname Get at that branch from elsewhere: git checkout -t -b branchname origin/branchname
Read the full article
POP Moved to Heroku
Adam Wiggins hooked me up with the Heroku stuff (and by hooked up, I mean I emailed Heroku support and he enabled the services for me), and so I moved my professional online presence to be hosted on Heroku. The URL is the same as before (http://www.darkhax.com), but now it should be just a bit snappier, and easier for me to deploy to. If you haven’t at least checked out Heroku by visiting the site, do so now.
Read the full article
Git on Windows
Speaking of git, you can get it on Windows, using msysgit. It works pretty well, in that I haven’t had any problems with it, except some minor line ending things. msysgitGetting Started with Git and GitHub on Windows – Kyle Cordes
Read the full article
Worth watching. Twice. Linus on git
It’s an older talk, but it’s still awesome. If you’ve never heard of git before, check it out. Javascript on, you must have.
Read the full article
Author
Daniel Huckstep is a software engineer (EIT) in Edmonton, Alberta, Canada
Hosting by:
