Re: Corkboard code

[Vincent van Ravesteijn]

Peter Kümmel schreef op 9-11-2013 12:09:
On 18.10.2013 03:32, Vincent van Ravesteijn wrote:

Be warned that this is an orphan branch (i.e. it is not connected to 
the lyx history).

Vincent


Is it possible to integrate an orphan branch without loosing history?

Peter


If I'm not wrong it is at least possible to rebase the orphan branch 
completely on top of the lyx history. I'm not sure what a merge does.

Vincent