On Thu, Nov 12, 2009 at 2:13 PM, Angrez Singh <[email protected]> wrote: > Hi, > > I got following error message when I issue the command "git pull origin > master" from GIT command prompt. > > $ git pull origin master > From [email protected]:bret/watir > * branch master -> FETCH_HEAD > error: Entry 'watir/bin/watir-console' not uptodate. Cannot merge. > fatal: merging of trees ef69d47d9f48a37ab5202e2701ad43e14f89e381 and > 292e55fcd72 > 4ef7ea51946bebcc3f9bc862ee37d failed >
You have local, uncommitted changes to watir/bin/watir-console. Either commit the changes first or do `git stash && git pull && git stash apply`. _______________________________________________ Wtr-development mailing list [email protected] http://rubyforge.org/mailman/listinfo/wtr-development
