Hi Amir,
this is not an MITK issue. Git is just telling you that you have local changes
(which you made yourself to your copy of the code) which will be overwritten by
the new commits of the new master branch (which you would like to pull).
Git is also telling you what you could do about it. You can either stash your
changes and pop them (re-apply) again on the new master or you can commit them
on another branch.
I recommend you to check what exactly you changed at your copy of MITK. Use
"git status" or "git diff" for that an overview and check whether you want to
keep these changes or not. I also recommend you to read a bit about the very
powerful version control system git:
http://git-scm.com/book
regards
Thomas
From: Amirhossein Jaberzadeh [mailto:[email protected]]
Sent: Dienstag, 22. Mai 2012 10:21
To: [email protected]
Subject: [mitk-users] Performing update step (git fetch) for 'MITK'
Dear all
I installed MITK using superbuild and it worked properly, Today when i compile
my plugin this error was appeared:
[ 0%] Performing update step (git fetch) for 'MITK'
Aborting
error: Your local changes to the following files would be overwritten by
checkout:
CMake/PackageDepends/MITK_Poco_Config.cmake
Please, commit your changes or stash them before you can switch branches.
make[2]: *** [MITK-cmake/src/MITK-stamp/MITK-update] Error 1
make[1]: *** [CMakeFiles/MITK.dir/all] Error 2
should I build new version of MITK manually?
Thanks for your help in advance,
Amir
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
mitk-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mitk-users
