I frequently get asked how to resolve conflicts in git. It’s not obvious how to do it, but it is surprisingly easy to do.
Posts Tagged ‘programming’
Merging and resolving conflicts with git
January 10th, 2014 
etdot 
Posted in programming 
Tags: git, programming 
Comments Off on Merging and resolving conflicts with gitConvert VSS to Git
March 10th, 2013 etdot I just converted my old Visual Source Safe (VSS) projects to Git repositories on my Gitolite server in minutes! I was impressed with how quick and easy the process was.
Posted in Computers, programming Tags: git, gitolite, programming, vss Comments Off on Convert VSS to GitMake Notepad++ editor for AstroGrep
March 14th, 2012 etdot For anyone still using AstroGrep, a great GUI GREP Utility for Windows, here is how you set Notepad++ as the default editor. If you are still using AstroGrep you may be too lazy to look up the command line switches for Notepad++, so here you are: copy and paste:
Table Hell vs. Div Hell
September 30th, 2010 etdot Today I revisited Smashing Magazine’s article, “Table Layouts vs. Div Layouts: From Hell to… Hell?“, and was reminded how insightful it is. For anyone in web developement it’s a good read on how and when to use div or table tags and how to use them properly with CSS for both content and presentation.
Sorting Algorithm Animations
November 30th, 2008 etdot I’m not sure why, but someone has put together animations comparing various sorting algorithms. Edutainment, anyone?