[Samba] Samba 4 git pull error

Michael Wood esiotrot at gmail.com
Tue Feb 7 13:32:34 MST 2012

"git diff" will tell you what the differences are. "git reset --hard
HEAD" followed by "git clean -xdf" and then "git pull" should sort you

On 07/02/2012, steve <steve at steve-ss.com> wrote:
> 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
> --
> To unsubscribe from this list go to the following URL and read the
> instructions:  https://lists.samba.org/mailman/options/samba

Michael Wood <esiotrot at gmail.com>

More information about the samba mailing list