I do the following steps ...
cd /d D:\Source\prototype
git pull
And get an error ...
Updating ab1313e..8bfd9cf
error: Entry 'src/dom/form.js' not uptodate. Cannot merge.
If I delete form.js, then pull works.
I'm used to using cvs update which simply merges all differences from
the main repository into my local copy.
Similarly for svn.
But git is different it seems.
Using git pull -v, I get ...
From git://github.com/sstephenson/prototype
= [up to date] caja -> origin/caja
= [up to date] experimental -> origin/experimental
= [up to date] integration -> origin/integration
= [up to date] layout -> origin/layout
= [up to date] master -> origin/master
= [up to date] rewrite -> origin/rewrite
= [up to date] sprockets -> origin/sprockets
Updating ab1313e..8bfd9cf
error: Entry 'src/dom/form.js' not uptodate. Cannot merge.
So, I know I suck at this, but any help would be appreciated.
Regards,
Richard Quadling.
--
-----
Richard Quadling
Zend Certified Engineer : http://zend.com/zce.php?c=ZEND002498&r=213474731
"Standing on the shoulders of some very clever giants!"