Git mergetool with Araxis

Monday 05 December 2011 at 10:00 pm

Just thought I'd drop this quick note should you also find the settings on the Araxis website don't work with your .gitconfig, I went through many attempts but this simple version worked for me.

[merge]
	tool = araxis
[mergetool "araxis"]
	cmd = araxisgitmerge.exe \"$REMOTE\" \"$BASE\" \"$PWD/LOCAL\" \"$PWD/MERGED\"

…or alternatively…

git config --global merge.tool araxis
git config --global mergetool.araxis.cmd 'araxisgitmerge.exe \"$REMOTE\" \"$BASE\" \"$PWD/LOCAL\" \"$PWD/MERGED\"'

Note: I added the Araxis installation directory to my PATH environment variable so not necessary above.

Ripple-tastic!

Thursday 01 December 2011 at 6:37 pm

Many people have been asking to know more about Ripple, a tool from the Fubu-family that allows you to manage your NuGet dependencies both locally and hosted. Still quite a new tool (knocked up by Jeremy & Josh over a hot beverage I believe) it's early days but am already finding it invaluable in our solution management.

What is it?

Under the simplest screnario you can use Ripple together with a rake (or other) build script to download configured dependencies before compiling your solution, futhermore you can ask Ripple to update all dependencies through your solution directory-tree to the latest version.

Nice, but no cigar!

Where I'm really loving Ripple is in managing local builds of dependencies across consuming solutions. By using the 'ripple local' feature I am able to build a local repository, package it up into NuGet packages, then update solutions consuming those dependencies with the newly built NuGet packages.

Sweet!

Usage

So let's take an example scenario using the GitHub FubuMVC.RippleDemo repostiory.

Read More

Quest for OSS contribution

Tuesday 06 September 2011 at 6:22 pm

Screaming MeSo I must be in my fifth year of saying “I really want to contribute to this OSS project, I have some great ideas but struggling to find the time” – fricken lame!

Yes you guessed it; a rant posting about my own inability to find time doing the things I want to do. These ‘things’ normally fall into the categories of “photography”, “blogging” or “OSS” but on this occasion it’s about getting into the #FubuMVC project – and really contribute; the contributor’s page on the fubu-project.org already seems like an unobtainable holy grail.

In my position of Development Manager I’m lucky enough to be able to introduce technologies into our stack that I see fit, this can include OSS, and this could mean mixing work responsibilities with contributing to that project and more so - the .NET community – but I’m still struggling.

My admiration goes out to all of you who achieve this; from Mark Rendle of #SimpleData, Andreas Håkansson + Steven Robbins of #NancyFX, to Jeremy Miller + Josh Arnold + Sam Merrell + Robert Greyling + Rex Morgan of #FubuMVC; you deserve a medal… or have a time machine.  

My father once proclaimed I could have 72 hours in a day and it wouldn’t be enough, my eyes were too big for my belly, he was right – I need to focus – the time is neigh!

*le sigh*

Reading list

  • Josh Arnold - Web developer, author & contributor of FubuMVC
  • Jeremy D Miller - Web developer, author & contributor of StructureMap & FubuMVC
  • Roy Osherove - Unit Testing, Agile Development, Leadership & .NET
  • Rob Ashton - Technical Lead & author of MvcEx and AutoPoco
Ian:

There will have to be very strict guidelines, the last thing you want is dispute over “.. but you gave him 5 credits and her only 3?!” which will undoubtedly lead to the scheme being rescinded. That re…

Gary Ewan Park:

This is a very interesting idea! It does leave some questions about how it is “policed”, and who decides whether a particular blog post, or SO answer warrants the credits, but I really do think that i…

Chris Marisic:

Being both a developer and a leader of developers, I have found little to be as integral to the speed and success of software development as intellisense. This is also why I leverage R# on top of Vis…

Franc:

I have to admit that Spark won me over very quickly, yes it is not perfect and yes I am not an expert in the subject but it has provided me with new skills. I have been a victim of its lack of intellis…

Randolph Burt:

Intellisense helps me code faster and make less mistakes. However, from a personal point of view, it can be the difference between enjoying development and not enjoying development – and if you don’t …

Jeremy D. Miller:

Nitpick so it doesn’t bite someone later, “Update project references to the updated dependencies” Ripple just does a crude copy of the assembly files. No project references are changed. My assump…