[Qt-creator] Updating from git

Stéphane stephane at hacout.com
Tue Mar 2 16:52:35 CET 2010


> 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
>
>   

hello,

I agree with your comment and encountered several times the same issue 
(lot of problems after a git pull).
Several things I do not do now to avoid this problems.
After a git pull, I run a make distclean to be sure to compile all the 
files and I do not run several make for distinct projects as the same 
time. Before sometimes, I was upgrading Qt and QtCreator at the same 
time and run parallel construction of both projects with make.
I could not get a correct result all the time. If then I make each 
project one after one, i do not encounter any more those compilations 
fails. I dot know what this occurs but it does !

Hope this helps and sorry for my poor English.
Best regards
Stephane



More information about the Qt-creator-old mailing list