The tip of using "git stash && git pull --rebase && git stash pop" (I think) But trying to build gives me now . /Data/work/haiku/haiku/generated.x86gcc4/build_packages/icu-devel-4.8.1.1-x86-gcc4-2011-12-20/develop/headers/3rdparty/unicode/unistr.h:4053:9: error: variable 'isError' set but not used [-Werror=unused-but-set-variable] /Data/work/haiku/haiku/generated.x86gcc4/build_packages/icu-devel-4.8.1.1-x86-gcc4-2011-12-20/develop/headers/3rdparty/unicode/unistr.h: In member function 'icu::UnicodeString& icu::UnicodeString::append(UChar32)': /Data/work/haiku/haiku/generated.x86gcc4/build_packages/icu-devel-4.8.1.1-x86-gcc4-2011-12-20/develop/headers/3rdparty/unicode/unistr.h:4349:9: error: variable 'isError' set but not used [-Werror=unused-but-set-variable] cc1plus: all warnings being treated as errors Should and how do I turn of that warning don't treated us erros? Second, any reason we don't uses icu 49.x (except that no one have updated it)? -- MVH Fredrik Modèen