[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [egit-dev] Bug in Switching?

It's a feature, but we should really inform the user about what changed
files were kept after the switch.

-- robin

----- Ursprungligt meddelande -----
> On 11/13/2012 09:57 AM, Marco Sousa wrote:
> > I don't lose changes, it was just the files that i modified.. but I
> > thought that we can't change if any modified exists.
> > 
> > With this someone can upload files in the wrong branch..
> 
> Yes, as i said, it's a feature; it's for the case where
> 
> 1) you do a change
> 2) you realize you're on the wrong branch
> 3) you switch the branch
> 4) you commit on the correct branch
> 
> of course this only works as long as there is no conflict.
> 
> with git you should always keep in mind your changes and your
> location in the repo. there are multiple operations which will bring
> you into troubles otherwise.
> 
> HTH, Markus
> 
> > 
> > -------------------------------------
> > Marco Sousa
> > 
> > 
> > 2012/11/13 Markus Duft <markus.duft@xxxxxxxxxx
> > <mailto:markus.duft@xxxxxxxxxx>>
> > 
> >     On 11/13/2012 08:59 AM, Marco Sousa wrote:
> >     > I have the stable egit 2.1.
> >     >
> >     > I can switch branch also if I have modified files without
> >     > commit or stash..
> > 
> >     This is a GIT feature. It let's you take changes with you on
> >     branch switch as long as they don't cause conflicts. So as
> >     long as the same files are not modified in a commit that is
> >     switched to, this is not a problem.
> > 
> >     Did you really loose changes, or was it just files that you
> >     modified, that where left alone on the target branch (this
> >     would be ok then)?
> > 
> >     HTH, Markus
> > 
> >     >
> >     > It should don't me let change branch in order to prevent that
> >     > your local changes are overwritten.
> >     >
> >     > Why I have this bug if in the forums especially says that you
> >     > can't do that:
> >     > http://www.eclipse.org/forums/index.php/t/369870/
> >     >
> >     >
> >     > -------------------------------------
> >     > Marco Sousa
> >     >
> >     >
> >     > _______________________________________________
> >     > egit-dev mailing list
> >     > egit-dev@xxxxxxxxxxx <mailto:egit-dev@xxxxxxxxxxx>
> >     > https://dev.eclipse.org/mailman/listinfo/egit-dev
> >     >
> >     _______________________________________________
> >     egit-dev mailing list
> >     egit-dev@xxxxxxxxxxx <mailto:egit-dev@xxxxxxxxxxx>
> >     https://dev.eclipse.org/mailman/listinfo/egit-dev
> > 
> > 
> _______________________________________________
> egit-dev mailing list
> egit-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/egit-dev
>