prog694/joebot — comment on commit 41ee8484aa10129c174f186748e872263e7dcf89
File: joebot.test/nbproject/build-impl.xml line 506
By blakeelias:

Some are slightly different. I've been going through them manually, takes a couple minutes to fix. If those are the only conflicts, then it's best to just use the "theirs" option to the recursive merge strategy.