Am Donnerstag, 15. März 2012 um 12:32:14, schrieb Vincent van Ravesteijn
<v...@lyx.org>
> Op 15-3-2012 10:55, Kornel Benko schreef:
> > Am Donnerstag, 15. März 2012 um 01:25:16, schrieb Lars Gullik
> > Bjønnes<lar...@gullik.org>
> >> On Thu, Mar 15, 2012 at 01:20, Julien Rioux<jri...@lyx.org> wrote:
> >>> Uwe, may I suggest to have two clones in two different folders. In one of
> >>> them you checkout 2.0.x, in the other you checkout master. I have found
> >>> that
> >>> switching between 2.0.x and master within the same clone folder doesn't
> >>> work
> >>> well at the moment anyway, as it leads to conflicting po files in the
> >>> source
> >>> tree.
> >> This is a problem with how things are built in LyX.
> > In autoconf, cmake build has no problems here. (Created po files are also
> > in the build dir)
> >
> >> Easy enough to reset (or stash) your working tree before you checkout the
> >> other
> >> branch though.
> > Is this the way to switch between master and 2.0.x source tree?
> >
> > master -> 2.0.x
> > 1.) git stash master
> git stash
> > 2.) git checkout 2.0.x
> > 3.) git pop 2.0.x
> git stash pop
> >
> > 2.0.x -> master
> > 1.) git stash 2.0.x
> > 2.) git checkout master
> > 3.) git pop master
> >
>
> It depends on what you want. In general I don't see why you want the
> changes you had in master to be applied to 2.0.x as well.
>
> If you made a useful change to the code, you want to 'commit' the
> changes before switching branches. If all changes can be discarde you
> can do 'git reset --hard' WARNING: all your changes disappear. If you
> realise that the changes you made belong in another branch than the one
> that was checked-out at the time, you can stash your changes, checkout
> another branch and pop the changes.
>
> You can also use the stash command to quickly put the changes aside, but
> then it is unlikely that you want to pop them in another branch.
>
> Vincent
>
Thanks. I thought there is a stash for each branch. Obviously not.
Kornel
signature.asc
Description: This is a digitally signed message part.
