cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Grzegorz Kossakowski <g...@tuffmail.com>
Subject How to perform merge of branch?
Date Thu, 19 Jul 2007 09:09:22 GMT
Hello,

I know that it is not tightly Cocoon-related question but I hope to get help from your.

I think I'm ready to merge changes made in whiteboard/objectmodel branch. I've started doing
so but I realized that files history (from 
branch) is lost during merge operation. My question is, how to perform merge of branch in
the way that history of files is also ported?

I've already searched the internet but no found solution seems to working for me, unfortunately.

-- 
Grzegorz Kossakowski
http://reflectingonthevicissitudes.wordpress.com/

Mime
View raw message