Derik Whittaker

Syndication

News


Images in this post missing? We recently lost them in a site migration. We're working to restore these as you read this. Should you need an image in an emergency, please contact us at imagehelp@codebetter.com
Being OCD and Merging don't mix

Let me start of by publicly admitting this, I am have OCD (Obsessive-compulsive disorder) when it comes to code.  My code must be clean and it must be uniform.  And because I am a ReSharper lover my disorder is even more drawn out.

Over the past month or so while I have been fixing bugs in our application I have been making 'harmless' changes to the various class files that I have been editing.  These changes involve removing dead using blocks, removing dead code, removing unneeded 'this' usages, making various improvements to the code, so on and so forth.  None of these were major and none should (wish we had tests to prove this) affect the quality of the application.  But since ReSharper has highlighted these various issues I thought I would change them.

Boy was that a bad idea.  Last week the team I am on had a directive to merge 3 different branches into our trunk and this needed to happen ASAP.  What I found out real early in our merge was we had TONS of conflicts or merge warnings because of all my 'changes' (VS Team's merge tool is not the best).  Almost all of issues were easy to merge, but the fact that we had to spend a ton of extra time on them was waste (should read these [book 1, book 2] for more information on removing waste).  We were able to get through the merge just fine, but it took longer then anticipated.

The moral of the post is this.  If you have OCD in respect to code and you are going to be doing merges, try to control your OCD.  If not your merges are going to be much more painful and take much longer then needed.

Till next time,


Posted 02-21-2008 1:34 PM by Derik Whittaker
Filed under: , ,

[Advertisement]

Comments

Eber Irigoyen wrote re: Being OCD and Merging don't mix
on 02-21-2008 3:35 PM

oh yeah, been there... and having members of your team do you that "favor", sucks big time

Keith Nicholas wrote re: Being OCD and Merging don't mix
on 02-21-2008 3:37 PM

the words you are looking for  "continuous integration"

Derik Whittaker wrote re: Being OCD and Merging don't mix
on 02-21-2008 3:43 PM

@Keith,

What is CI going to do for my merging?

DotNetKicks.com wrote OCD and Merging don't mix
on 02-21-2008 6:26 PM

You've been kicked (a good thing) - Trackback from DotNetKicks.com

Cheap propecia buy propecia online. wrote Buy propecia online.
on 07-28-2008 10:00 AM

Buy xenical and propecia online from pharmcom. Buy propecia.

on 08-07-2008 3:41 AM

Lexapro.

Pharmf854 wrote re: Being OCD and Merging don't mix
on 05-06-2009 7:15 PM

Very nice site! <a href="oieypxa.com/.../1.html">cheap viagra</a>

Pharmg989 wrote re: Being OCD and Merging don't mix
on 05-06-2009 7:16 PM

Very nice site!  [url=oieypxa.com/.../2.html]cheap cialis[/url]

Pharmg335 wrote re: Being OCD and Merging don't mix
on 05-06-2009 7:16 PM

Very nice site! cheap cialis oieypxa.com/.../4.html

Pharme642 wrote re: Being OCD and Merging don't mix
on 05-06-2009 7:16 PM

Very nice site!

Pharmf710 wrote re: Being OCD and Merging don't mix
on 05-13-2009 10:26 AM

Very nice site! <a href="aieypxo.com/.../1.html">cheap viagra</a>

Pharmf413 wrote re: Being OCD and Merging don't mix
on 05-13-2009 10:26 AM

Very nice site!  [url=aieypxo.com/.../2.html]cheap cialis[/url]

Pharmk39 wrote re: Being OCD and Merging don't mix
on 05-13-2009 10:27 AM

Very nice site! cheap cialis aieypxo.com/.../4.html

Pharmf170 wrote re: Being OCD and Merging don't mix
on 05-13-2009 10:27 AM

Very nice site!

Diesel wrote re: Being OCD and Merging don't mix
on 05-28-2009 8:51 PM

<a href= http://cheatsi

Neo wrote re: Being OCD and Merging don't mix
on 05-30-2009 2:28 PM

<a href= beenationalscrippsspelling.saidauts.info >bee national scripps spelling</a>  

<a href= thenjbergenrecordnewspape

Jane wrote re: Being OCD and Merging don't mix
on 05-31-2009 6:58 PM

<a href= catowlpussy.realauts.info >cat owl pussy</a>  

<a href= progesteronenaturalcream.stateauts.info >progesterone natural cream</a>  

<a hr

Halo wrote re: Being OCD and Merging don't mix
on 06-20-2009 8:34 PM

<a href= http://design+template+powerpoint+free.thanauts.info/ >design template powerpoint free</a>  

<a href= http://rash+or+hives.thanauts.info/ >rash or hives</a>  

<a href= http://the+best+buys.thanauts.info/ >the best buys</a>  

<a href= http://departamento+de+hacienda+puerto+rico.thanauts.info/ >departamento de hacienda puerto rico</a>  

<a href= http://big+titty+women.thanauts.info/ >big titty women</a>  

<a href= http://on+three+mile+island.thanauts.info/ >on three mile island</a>  

<a href= http://trader+auto+canada.thanauts.info/ >trader auto canada</a>  

<a href= http://long+distant+phone+companies.thanauts.info/ >long distant phone companies</a>  

<a href= http://washington+craigs+list.thanauts.info/ >washington craigs list</a>  

<a href= http://zen+art+motorcycle+maintenence.thanauts.info/ >zen art motorcycle maintenence</a>  

<a href= http://what+does+a+name+mean.thanauts.info/ >what does a name mean</a>  

<a href= http://how+to+masturbate+for+girls.thanauts.info/ >how to masturbate for girls</a>  

<a href= http://development+home+new.thanauts.info/ >development home new</a>  

<a href= http://free+gay+sex+gallery.thanauts.info/ >free gay sex gallery</a>  

<a href= http://want+more+cowbell.thanauts.info/ >want more cowbell</a>  

<a href= http://paintings+by+pablo+picasso.thanauts.info/ >paintings by pablo picasso</a>  

<a href= http://burning+hotel+resort+shore.thanauts.info/ >burning hotel resort shore</a>  

<a href= http://my+personal+values.thanauts.info/ >my personal values</a>  

<a href= http://of+application+integration.thanauts.info/ >of application integration</a>  

<a href= http://divorce+and+support.thanauts.info/ >divorce and support</a>

Jane wrote re: Being OCD and Merging don't mix
on 06-20-2009 9:17 PM

<a href= http://how+to+block+your+number.thanauts.info/ >how to block your number</a>  

<a href= http://aciphex+and+side+effects.thanauts.info/ >aciphex and side effects</a>  

<a href= http://lay+it+out.thanauts.info/ >lay it out</a>  

<a href= http://logan+s+run.thanauts.info/ >logan s run</a>  

<a href= http://garage+tile+floors.thanauts.info/ >garage tile floors</a>  

<a href= http://castlevania+curse+darkness+through+walk.thanauts.info/ >castlevania curse darkness through walk</a>  

<a href= http://legal+movie+downloads.thanauts.info/ >legal movie downloads</a>  

<a href= http://men+s+fitness+magazines.thanauts.info/ >men s fitness magazines</a>  

<a href= http://free+jenna+jameson+video.thanauts.info/ >free jenna jameson video</a>  

<a href= http://a+duffel+bag.thanauts.info/ >a duffel bag</a>  

<a href= http://lyric+ride+with+me.thanauts.info/ >lyric ride with me</a>  

<a href= http://ikon+office+solutions.thanauts.info/ >ikon office solutions</a>  

<a href= http://what+homes+are+selling+for.thanauts.info/ >what homes are selling for</a>  

<a href= http://title+of+a+car.thanauts.info/ >title of a car</a>  

<a href= http://free+career+quizzes.thanauts.info/ >free career quizzes</a>  

<a href= http://dining+furniture+room+sixties.thanauts.info/ >dining furniture room sixties</a>  

<a href= http://dora+free+game.thanauts.info/ >dora free game</a>  

<a href= http://chord+tabs+for+guitar.thanauts.info/ >chord tabs for guitar</a>  

<a href= http://cheap+flights+spain.thanauts.info/ >cheap flights spain</a>  

<a href= http://antwerp+is+in.thanauts.info/ >antwerp is in</a>

Dominic wrote re: Being OCD and Merging don't mix
on 06-21-2009 12:23 AM

<a href= http://insurance+life+rating.thanauts.info/ >insurance life rating</a>  

<a href= http://sixflags+magic+mountain.thanauts.info/ >sixflags magic mountain</a>  

<a href= http://a+history+of+music.thanauts.info/ >a history of music</a>  

<a href= http://mega+millions+texas+lotto.thanauts.info/ >mega millions texas lotto</a>  

<a href= http://university+phoenix+student+web+page.thanauts.info/ >university phoenix student web page</a>  

<a href= http://job+in+entertainment.thanauts.info/ >job in entertainment</a>  

<a href= http://broadway+lion+king.thanauts.info/ >broadway lion king</a>  

<a href= http://universal+at+t+card.thanauts.info/ >universal at t card</a>  

<a href= http://arts+martial+mixed+training.thanauts.info/ >arts martial mixed training</a>  

<a href= http://dresses+for+bridesmaids.thanauts.info/ >dresses for bridesmaids</a>  

<a href= http://delaware+subaru+wilmington.thanauts.info/ >delaware subaru wilmington</a>  

<a href= http://alaska+cruise+special.thanauts.info/ >alaska cruise special</a>  

<a href= http://what+is+direct+connect.thanauts.info/ >what is direct connect</a>  

<a href= http://prince+and+me+lyrics.thanauts.info/ >prince and me lyrics</a>  

<a href= http://ceiling+fan+install.thanauts.info/ >ceiling fan install</a>  

<a href= http://movies+to+burn+dvd.thanauts.info/ >movies to burn dvd</a>  

<a href= http://costume+french+maid.thanauts.info/ >costume french maid</a>  

<a href= http://bigraphy+of+bill+gates.thanauts.info/ >bigraphy of bill gates</a>  

<a href= http://what+is+bilateral.thanauts.info/ >what is bilateral</a>  

<a href= http://sav+on+drug.thanauts.info/ >sav on drug</a>

Neo wrote re: Being OCD and Merging don't mix
on 06-21-2009 5:16 AM

<a href= http://final+fantasy+7+rom.thanauts.info/ >final fantasy 7 rom</a>  

<a href= http://how+to+make+money+online+free.thanauts.info/ >how to make money online free</a>  

<a href= http://portland+churches+oregon.thanauts.info/ >portland churches oregon</a>  

<a href= http://laptop+computer+and+reviews.thanauts.info/ >laptop computer and reviews</a>  

<a href= http://king+of+troy.thanauts.info/ >king of troy</a>  

<a href= http://the+making+of+film.thanauts.info/ >the making of film</a>  

<a href= http://mobile+phone+unlocking+software+free+downloads.thanauts.info/ >mobile phone unlocking software free downloads</a>  

<a href= http://sebaceous+cyst+pictures.thanauts.info/ >sebaceous cyst pictures</a>  

<a href= http://cords+of+guitar.thanauts.info/ >cords of guitar</a>  

<a href= http://juice+a+pomegranate.thanauts.info/ >juice a pomegranate</a>  

<a href= http://a+motivation+letter.thanauts.info/ >a motivation letter</a>  

<a href= http://rachael+ray+30+minute+meals+recipes.thanauts.info/ >rachael ray 30 minute meals recipes</a>  

<a href= http://bible+life+application.thanauts.info/ >bible life application</a>  

<a href= http://brandy+all+in+me+lyrics.thanauts.info/ >brandy all in me lyrics</a>  

<a href= http://a+rainbow+bridge.thanauts.info/ >a rainbow bridge</a>  

<a href= http://the+play+station+3.thanauts.info/ >the play station 3</a>  

<a href= http://kitchen+furniture+in.thanauts.info/ >kitchen furniture in</a>  

<a href= http://river+songs+greeting.thanauts.info/ >river songs greeting</a>  

<a href= http://governor+of+calif.thanauts.info/ >governor of calif</a>  

<a href= http://how+to+open+a+iso+file.thanauts.info/ >how to open a iso file</a>

Hero wrote re: Being OCD and Merging don't mix
on 08-25-2009 7:21 AM
Neo wrote re: Being OCD and Merging don't mix
on 10-01-2009 7:29 AM

<a href= teatroalfieritorinospettacoli.obvlajg.cn >teatro alfieri torino spettacoli</a>  

<a href= http://bulgingdisc

girls wrote re: Being OCD and Merging don't mix
on 10-04-2009 3:18 AM

<a href= www.fronkndegofilms.com/.../index.php >hot  girls</a>  

woman wrote re: Being OCD and Merging don't mix
on 10-04-2009 12:49 PM

<a href= acecombatskies.com/index.php >hot naked teen</a>  

college wrote re: Being OCD and Merging don't mix
on 10-09-2009 2:57 AM

<a href= forums.matrix.squiz.net/index.php >hottie college girls</a>  

cartoons wrote re: Being OCD and Merging don't mix
on 10-12-2009 2:29 AM

<a href= www.fronkndegofilms.com/.../index.php >cartoon porn games</a>  

toons wrote re: Being OCD and Merging don't mix
on 10-12-2009 3:51 PM

<a href= www.rockhero.gr/.../index.php >toon tgp</a>  

shower wrote re: Being OCD and Merging don't mix
on 10-13-2009 4:23 PM

<a href= forums.nekothekitty.net/index.php >girl in shower</a>  

valium wrote re: Being OCD and Merging don't mix
on 10-14-2009 8:59 AM

Hello!

<a href="www.esda.name/.../view.php ,

propecia wrote re: Being OCD and Merging don't mix
on 10-14-2009 2:59 PM

Hello!

<a href="www.esda.name/.../view.php ,

dicks wrote re: Being OCD and Merging don't mix
on 10-15-2009 11:07 AM

<a href= forums.westernhorseman.com/index.php >large dick</a>  

Kir wrote re: Being OCD and Merging don't mix
on 10-15-2009 11:53 AM
dicks wrote re: Being OCD and Merging don't mix
on 10-16-2009 6:56 PM

<a href= forums.unibg.org/index.php >guys dicks</a>  

dick wrote re: Being OCD and Merging don't mix
on 10-17-2009 3:19 AM

<a href= support.magix.net/.../index.php >how to suck dick</a>  

valium wrote re: Being OCD and Merging don't mix
on 10-19-2009 9:01 AM
propecia wrote re: Being OCD and Merging don't mix
on 10-19-2009 3:04 PM
valium wrote re: Being OCD and Merging don't mix
on 10-19-2009 9:03 PM
propecia wrote re: Being OCD and Merging don't mix
on 10-20-2009 3:20 PM

Hello!

<a href="www.xbox360achievements.org/.../member.php propecia</a> ,

ambien wrote re: Being OCD and Merging don't mix
on 10-20-2009 4:20 PM
snorting_ambien wrote re: Being OCD and Merging don't mix
on 10-21-2009 11:04 AM
from wrote re: Being OCD and Merging don't mix
on 10-21-2009 4:18 PM
disorder wrote re: Being OCD and Merging don't mix
on 10-21-2009 10:28 PM

Hello!

<a href="vilinet.communityserver.com/.../593LowestPricesAMBIEN.aspx">sleep disorder with ambien</a> ,

without wrote re: Being OCD and Merging don't mix
on 10-23-2009 8:39 AM
ambien wrote re: Being OCD and Merging don't mix
on 10-24-2009 8:29 PM
eating wrote re: Being OCD and Merging don't mix
on 10-25-2009 8:32 AM

Hello!

<a href="blogcastrepository.com/.../LowestPricesAMBIEN626.aspx">sleep eating related to ambien</a> ,

ambien wrote re: Being OCD and Merging don't mix
on 10-25-2009 2:33 PM
and wrote re: Being OCD and Merging don't mix
on 10-25-2009 8:33 PM
ambien wrote re: Being OCD and Merging don't mix
on 10-26-2009 8:37 AM

Hello!

<a href="collaborationproject.org/.../~cheapambien117">buy ambien on line</a> ,

Pharma74 wrote re: Being OCD and Merging don't mix
on 10-29-2009 8:37 PM

Very nice site!

Pharmd668 wrote re: Being OCD and Merging don't mix
on 10-31-2009 6:22 AM

Very nice site!

justainbea wrote re: Being OCD and Merging don't mix
on 10-31-2009 3:18 PM

computer environmental extinctions new projected resulted individual

kendra wrote re: Being OCD and Merging don't mix
on 11-01-2009 7:02 PM

<a href= blog.co.tz/entry.php >kendra wilkinson naked pics</a>  

Pharmb544 wrote re: Being OCD and Merging don't mix
on 11-02-2009 9:07 PM

Very nice site!

About The CodeBetter.Com Blog Network
CodeBetter.Com FAQ

Our Mission

Advertisers should contact Brendan

Subscribe
Google Reader or Homepage

del.icio.us CodeBetter.com Latest Items
Add to My Yahoo!
Subscribe with Bloglines
Subscribe in NewsGator Online
Subscribe with myFeedster
Add to My AOL
Furl CodeBetter.com Latest Items
Subscribe in Rojo

Member Projects
DimeCasts.Net - Derik Whittaker

Friends of Devlicio.us
Red-Gate Tools For SQL and .NET

NDepend

SlickEdit
 
SmartInspect .NET Logging
NGEDIT: ViEmu and Codekana
LiteAccounting.Com
DevExpress
Fixx
NHibernate Profiler
Unfuddle
Balsamiq Mockups
Scrumy
JetBrains - ReSharper
Umbraco
NServiceBus
RavenDb
Web Sequence Diagrams
Ducksboard<-- NEW Friend!

 



Site Copyright © 2007 CodeBetter.Com
Content Copyright Individual Bloggers

 

Community Server (Commercial Edition)