Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

[Jean-Marc Lasgouttes]

Le 24/05/13 12:20, Vincent van Ravesteijn a écrit :

I've reset the branch now to the last commit you made. All commits from
master were somehow rebased or cherry-picked on top of the feature branch.

Thanks, I am not sure what I did wrong.

You can merge it into master by:

   git checkout master
   git merge empty-length -m "Please supply a commit message instead of
the default"

Will do.

or you can rebase onto master and fix the history:

   git checkout empty-length
   git rebase master -i
   <remove the commits that are there only because someone forgot
something in a previous commit>

"Remove" is not remove, right? Shouldn't I use squash instead?

   git checkout master
   git merge empty-length (this will fast-forward master)

I understand this one; but the following ones made my head explode.

So, what should I do about the kill-gettext branch now?

JMarc