search for: util_cmdlin

steve at hh3:~/samba-master> git pull Updating bfc7481..e32ad9b error: Your local changes to the following files would be overwritten by merge: auth/common_auth.h auth/credentials/credentials_ntlm.c auth/credentials/credentials_samba3.c <snip> source3/lib/util_cmdline.c source3/libads/dns.c source3/libads/k Aborting I haven't changed any files under samba-master. I have a backup of /usr/local/samba and samba-master. Do I delete and start again? Thanks, Steve

...ap.c Compiling lib/dprintf.c Compiling ../libcli/registry/util_reg.c Compiling lib/wins_srv.c Compiling lib/util_str.c Compiling lib/clobber.c Compiling lib/util_sid.c Compiling lib/util_unistr.c Compiling ../lib/util/charset/codepoints.c Compiling lib/util_file.c Compiling lib/util.c Compiling lib/util_cmdline.c Compiling lib/util_names.c Compiling lib/util_sock.c Compiling lib/sock_exec.c Compiling lib/util_sec.c Compiling lib/substitute.c Compiling lib/dbwrap_util.c Compiling lib/ms_fnmatch.c Compiling lib/errmap_unix.c Compiling lib/tallocmsg.c Compiling lib/dmallocmsg.c Compiling libsmb/clisigning.c...

...ating netapi.vscript [ 91/3572] Generating gse.vscript [ 92/3572] Generating msrpc3.vscript [ 93/3572] Generating samba-passdb.vscript [ 94/3572] Generating smbldaphelper.vscript [ 95/3572] Generating popt_samba3.vscript [ 96/3572] Generating popt_samba3_cmdline.vscript [ 97/3572] Generating util_cmdline.vscript [ 98/3572] Generating cmdline_contexts.vscript [ 99/3572] Generating samba-cluster-support.vscript [ 100/3572] Generating messages_dgm.vscript [ 101/3572] Generating messages_util.vscript [ 102/3572] Generating smbd_shim.vscript [ 103/3572] Generating libsmb.vscript [ 104/3572] Generatin...