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

Reply via email to