-
I've been meaning to put together a post about this for a few days, but Mark Embling beat me to it . I'm a big fan of PowerShell and Git, but had never bothered using them together until Jeremy Skinner's post about adding tab completion pushed me over the edge. Mark's post has more details, but the short...
-
I was trying to push to a canonical repository this morning and got the following error: $ git push origin master error: src refspec master matches more than one. error: failed to push some refs to 'ssh://user@host/srv/git/repo' This happened because I had accidentally created a master tag locally: ...
-
I saw Scott Bellware recently write on twitter: for christmas, i really want a git hook to detect if an update has changes in the db/migrations folder Cory Foy , Aaron Jensen , and myself all responded in turn. I think Cory and I were quickly searching for which git hook could be used for this idea....
-
DISCLAIMER : This is only relevant if you or someone contributing to your project are doing cross-platform development. If you are typically just developing on Windows, you should be able to keep the config options set to false. The Problem While trying to commit changes to a file I have under source...
-
At a very high level, all branching strategies have the same core policies: create the branch when you are confident that the cost of branching and merging is less than the cost of committing to the main source line, and merge when you are “done, done” making changes in that branch. There are many branching...
-
Last monday (8th of Feb) I did an E-VAN on Git ; an introductory talk on Git and DVCS, covering pretty much everything you need to know for day-to-day Git life. I think it went down well, certainly didn't hear anyone complaining. The talk was recorded, so if you haven't already seen it then you can do...
-
Here's a few ways to think about Git and it's distributed nature. You deal with multiples of repositories, not a single central repository Updates come from a remote repository, and changes are pushed to a remote; none of these repositories have to be the same Origin is the canonical name for the repository...
-
Anyone that follow me on twitter likely knows that I’m a big fan of Git these days. I’ll spare you the gushing heart felt nausea of how it’s so awesome and skip right to the point, though: I don’t always have the luxury of being able to use Git. For example, my current team has been using Subversion...
-
When performing a merge in git , you might see the message: warning: Cannot merge binary files: HEAD:somefile.dll vs. otherbranch:somefile.dll Auto-merging somefile.dll CONFLICT (content): Merge conflict in somefile.dll Automatic merge failed; fix conflicts and then commit the result. In this scenario...
-
Here we go again, explaining the internals of Git with the intention of helping you understand what you're doing day-to-day. Last time I covered branches, HEAD, and fast-forwarding . Today we'll dive into the guts of merging and rebasing. Merging branches You've probably merged before. You do it when...
-
Lets get some learning done. There are a few questions that keep cropping up when I introduce people to Git, so I thought I'd post some answers as a mini-series of blog posts. I'll cover some fundamentals, while trying not to retread too much ground that the fantastic Git community book already covers...
-
I was reading "Pro Git" by Scott Chacon and was on the section about "git instaweb". This is where you can run gitweb, a cgi script that comes with git, locally or on a server. I have successfully gotten gitweb up for my personal git repos on my remote server. I use it all the time. I was curious if...
-
I know I'm not alone when I say that I've been hearing a lot more about Git lately. I have talked to others that have expressed interested in moving to Git and dropping use of Subversion. Now just to properly date this post... (SVN is currently on version 1.6.5 and Git is on version v1.6.4.4). Gaining...
-
After my previous post on building a “real” rake task , I decided to dive in head first and learn how to get this stuff done. I chose to drive the tasks out via rspec, through a TDD process, and I created a couple of rake tasks that are proving to be quite useful to me: an msbuild task and an assembly...
-
I've heard or read too many git blog posts/pod casts state that if you create a new file in your local Git repo and you want to shorten the steps on getting it added to the local repository, all you have to do is: git commit -am "my commit message" This is _not_ true. If the file has never been added...