Git pull error

Rohit Rajan rohit.rajan at
Thu Apr 15 21:00:18 MDT 2010

Dear All,


I just tried to get the latest git version today and got the following 

Resolving 331 deltas...
  100% (331/331) done
150 objects were added to complete this thin pack.
* refs/remotes/origin/master: fast forward to branch 'master' of 
git:// 74c4c7f..a7f8c19
* refs/remotes/origin/v3-4-test: fast forward to branch 'v3-4-test' of 
git:// 3dab331..302e9b1c
* refs/remotes/origin/v3-5-test: fast forward to branch 'v3-5-test' of 
git:// ce565b0..12936bf
Updating deccb6c..a7f8c19
librpc/gen_ndr/cli_winreg.c: needs update
source4/librpc/gen_ndr/README: needs update
fatal: Entry 'librpc/gen_ndr/cli_winreg.c' not uptodate. Cannot merge.

Rohit Rajan
This message may contain confidential, proprietary or legally privileged information. In case you are not the original intended recipient of the message, you must not, directly or indirectly, use, disclose, distribute, print, or copy any part of this message and you are requested to delete it and inform the sender. 

Any views expressed in this message are those of the individual sender unless otherwise stated. Nothing contained in this message shall be construed as an offer or acceptance of any offer by "Catalyst Business Partners" or any of its subsidiaries unless sent with that express intent and with due authority of Catalyst Business Partners. 

Catalyst Business Partners has taken sufficient measures and precautions to prevent the spread of viruses. However the company accepts no liability for any damage caused by any virus transmitted by this email.

More information about the samba-technical mailing list