If you’re working on a project, chances are you’re also using some kind of issue tracker (like Jira or Trac). Most modern issue trackers allow integration with version control systems such as Git, so that it’s possible to view any commits attached to a certain issue. This works by the issue tracker parsing the commit message and looking for certain patterns corresponding to issues. Jira for example identifies it’s issues through the pattern “FOO-n”, where “n” is a number and…

I have just created a Git presentation. The presentation is named Git, Practical Tips, and it contains good practices that I have picked up during my four years as a Git user. The presentation consists of six parts, A quick introduction; History manipulation with merge, rebase and reset; Finding with Git; Configuration; Under the hood; and Interacting with Github. If you find this interesting and would like to hear a very practical presentation about Git tips and tricks, feel free…

This tutorial describes the process of setting up a simple ASP.NET MVC Web Application with Entity Framework and Code First Migrations and a workflow for developing, testing, staging and deploying the application with full automation using GitHub, Jenkins and IIS. Setting up a development machine First of all, make sure you have installed the following software: Git for Windows or GitHub for Windows. .NET 4 (or higher). Version 4.5 is required if you are using EF5. Visual Studio 2010 (or…

It lets you stage parts of files for commit, let me show you how. Intro I cannot do one thing at a time, I try to, but never succeed. Especially when It comes to coding. All the time I find myself working on a feature, and when jumping around in the code base I find stuff that needs fixing, and I fix it. As a result of this, my commit messages often have a bullet list, or some “and”s in…

So you have heard about continuous delivery and continuous deployment and you are eager to try, but your manager is afraid that you will lose traceability of the project. How can frequent updates of your binaries be tracked in a rapidly progressive environment, where every commit is a potential release? Artifact Version vs. Commit The traditional Java community way of version handling with a three digit number, potentially followed by a build number or a qualifier, e.g. 1.2.3.RELEASE, works well…

Git is an amazing version control system that never loses anything, but sometimes it can be hard to find out where things are. Most of the time it is going to be git log that is our friend, but not all the time. Where is my file? Sometimes you know that you have a file in your repository but, you don't know exactly where it is. git ls-files is the answer.

Obviously, you can use any particular grep options…

I had the unfortunate experience of having to use Subversion again after using Git for a long time. It is amazing how fast I can forget. After renaming a directory at the prompt, and the agony that goes with it, I decided to switch back to Git. $ mv requester sampler # svn agony after renaming a directory $ svn st ? sampler ! requester ! requester.rb A sampler.rb The tool to use when using Git with Subversion is, of…

When you clone a git repository, everything is automatically setup to allow you to fetch, pull, push to and from the remote repository, origin. But what is really going on? git remote is configured with a few lines of configuration in the config file inside the .git/ directory. Here’s how it works: Create a new repository, called base, add a file to it, then commit.

Clone this repository, called klon.

Initialize a new repository, called kopy.

The…

If you use Git locally against a Subversion repository you might run into problems if your project is set up to generate automatic build numbers through the buildnumber-maven-plugin, since the plugin might be setup to get the build numbers from Subversion. Through some use of additional profiles you can work around this.