Git pull error
Rohit Rajan
FYI
I just tried to get the latest git version today and got the following
error.
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://git.samba.org/samba
old..new: 74c4c7f..a7f8c19
* refs/remotes/origin/v3-4-test: fast forward to branch 'v3-4-test' of
git://git.samba.org/samba
old..new: 3dab331..302e9b1c
* refs/remotes/origin/v3-5-test: fast forward to branch 'v3-5-test' of
git://git.samba.org/samba
old..new: 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.
Thanks
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.
Michael Wood
On 16 April 2010 05:00, Rohit Rajan <rohit...@catalyst-us.com> wrote:
> Dear All,
>
> FYI
>
> I just tried to get the latest git version today and got the following
> error.
>
> 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://git.samba.org/samba
> old..new: 74c4c7f..a7f8c19
> * refs/remotes/origin/v3-4-test: fast forward to branch 'v3-4-test' of
> git://git.samba.org/samba
> old..new: 3dab331..302e9b1c
> * refs/remotes/origin/v3-5-test: fast forward to branch 'v3-5-test' of
> git://git.samba.org/samba
> old..new: 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.
It seems you have made changes to those three files but not checked
them in yet and the pull could not merge the upstream changes with
your local changes.
The following seem mostly to mention checkout rather than merge (which
a pull does).
http://www.google.com/search?q=fatal%3A+Entry+%22not+uptodate.+Cannot+merge.%22
I am not a git expert, but maybe you'd have more control over this if
you do separate git fetch and git merge commands instead of git pull
which does both together.
The git fetch is unnecessary right now because your git pull has
already done it.
Try reading the git-merge man page. Using a different merge strategy
might help.
This section of the man page also looks relevant:
PRE-MERGE CHECKS
Before applying outside changes, you should get your own work in good
shape and committed locally, so it will not be clobbered if there are
conflicts. See also git-stash(1). git pull and git merge will stop
without doing anything when local uncommitted changes overlap with
files that git pull/git merge may need to update.
--
Michael Wood <esio...@gmail.com>