Smalltalk › Gnu

Right way to clone sources

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

3 messages Options

Giuseppe

Right way to clone sources

Hi all,

I have cloned the source of GST in my disk. Every time I want to test
the new things, I did:

sudo make uninstall
make clean
git pull

but always end in something like:
error: Entry 'configure.ac' not uptodate. Cannot merge.

If I delete this file, then, other file can't merge. At the end, I
always delete the sources folder, and did a "git clone" again.

What I'm doing wrong? How can I do a "clean" git pull?

Cheers.

Giuseppe Luigi Punzi Ruiz
Blog: http://www.lordzealon.com
Twitter & Skype & GoogleTalk accounts: glpunzi

_______________________________________________
help-smalltalk mailing list
[hidden email]
http://lists.gnu.org/mailman/listinfo/help-smalltalk

Alexey Zakhlestin

Re: Right way to clone sources

On 28.06.2010, at 23:22, Giuseppe Luigi Punzi Ruiz wrote:

> Hi all,
>
> I have cloned the source of GST in my disk. Every time I want to test the new things, I did:
>
> sudo make uninstall
> make clean
> git pull
>
> but always end in something like:
> error: Entry 'configure.ac' not uptodate. Cannot merge.
>
> If I delete this file, then, other file can't merge. At the end, I always delete the sources folder, and did a "git clone" again.
>
> What I'm doing wrong? How can I do a "clean" git pull?

git reset --hard
git clean -df
git pull

_______________________________________________
help-smalltalk mailing list
[hidden email]
http://lists.gnu.org/mailman/listinfo/help-smalltalk

smime.p7s (3K) Download Attachment

Paolo Bonzini-2

Re: Right way to clone sources

In reply to this post by Giuseppe

On Mon, Jun 28, 2010 at 21:22, Giuseppe Luigi Punzi Ruiz
<[hidden email]> wrote:

> Hi all,
>
> I have cloned the source of GST in my disk. Every time I want to test the
> new things, I did:
>
> sudo make uninstall
> make clean
> git pull
>
> but always end in something like:
> error: Entry 'configure.ac' not uptodate. Cannot merge.

You must have made some changes to these files.

Alexey's hint should work.

Paolo

_______________________________________________
help-smalltalk mailing list
[hidden email]
http://lists.gnu.org/mailman/listinfo/help-smalltalk