Hi
This is standard GIT protection for edited files.
As the message says you must either preserve of lose the changed files.
To lose it/them just replace all files shown in the Staging View by
HEAD. Then you're good to go.
Regards
Ed Willink
On 18/01/2013 21:45, Benjamin Cabé wrote:
FWIW I have the very same issue, so sth is probably wrong in the git repo
itself indeed...
Benjamin
Eric Gwin<eric.g...@oracle.com> a écrit :
Ok. got past it again by "unstaging" the file. and was able to checkout the
Juno branch, but it should still probably be looked into.
-Eric
On 18/01/2013 2:14 PM, Eric Gwin wrote:
David,
For a while now I've been having trouble switching my simrel branch. I thought
it was just my system, but tried from another system recently. Any attempt to
switch to the Juno_maintenance branch is giving me:
"error: Your local changes to the following files would be overwritten by
checkout:
soa-bpel.b3aggrcon
Please commit your changes or stash them before you can switch branches."
This is from a freshly cloned repo.
I don't know if the issue is mine (can't see how), or a corrupt git repo, or
something to do with the soa-bpel file.
-Eric
_______________________________________________
cross-project-issues-dev mailing list
cross-project-issues-dev@eclipse.org
https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
_______________________________________________
cross-project-issues-dev mailing list
cross-project-issues-dev@eclipse.org
https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
_______________________________________________
cross-project-issues-dev mailing list
cross-project-issues-dev@eclipse.org
https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
-----
No virus found in this message.
Checked by AVG - www.avg.com
Version: 2013.0.2890 / Virus Database: 2639/6039 - Release Date: 01/17/13
_______________________________________________
cross-project-issues-dev mailing list
cross-project-issues-dev@eclipse.org
https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev