Ok I used the Diff GUI to look at the original and the new versions and the look correct now. Let me know if you see any new craziness.
On Fri, Apr 19, 2013 at 10:03 PM, Justin Mclean <[email protected]>wrote: > Hi, > > > Yeah that's weird. very minor merge differences. little things like a > > </p> and some versioning changes on the ASDOC comments. I'll correct > them > > and get them back up. > > If you used to SVN double check any merge with Git they may not be what > you expect. I've found that rebase seems to merge in the opposite way than > you expect and overwrites other changes - probably just something I don't > understand but it's annoying. (see the README issue from the other day) > > If you want to do a diff to see what a push will before you push try this: > git diff origin/develop HEAD > > Thanks, > Justin
