[Qt-creator] Updating from git

[Thorbjørn Lindeijer]

On 03/02/2010 06:43 AM, ext Colin Kern wrote:
> Hi,
>
> I'm a git novice, and I'm wondering what the correct way to update my
> local QtCreator build from git is.  Last time I did this, I tried:
> git pull
> qmake
> make
>
> and that seemed to cause a lot of problems.  I finally just nuked my
> directory and cloned the repository from scratch.  What's the right
> way to do this?

The above sequence of commands is perfectly valid, and there is no 
reason why this should be causing "a lot of problems" (what kind of 
problems?).

That said, sometimes there are changes that are not picked up by the 
dependencies used in the Makefiles, in case you may need to run a 'qmake 
-r' (to run qmake recursively over everything) or maybe even do a 'make 
distclean' before running qmake again.

Note that if you're committing local changes, you'll want learn how to 
rebase and use 'git pull --rebase' instead of a regular pull, to avoid 
creating merge commits between your local work and new upstream commits.

And, if pull doesn't work due to uncommitted local changes, the easiest 
is to do 'git stash' to stash those changes away and then use 'git stash 
pop' after pulling. This is the same that Brian said that Qt Creator 
will suggest if you do a pull with local changes.

Regards,
Bjørn

-- 
Thorbjørn Lindeijer
Software Engineer
Nokia, Qt Development Frameworks