> Ok, I'll make more verbose comments to commits. > P.S. swap is required for zram support - I should rebase > andrew/zram-support on top of andrew/enable-swap?
Yes you can do that even if it not great. Do: git checkout andrew/zram-support git rebase --onto andrew/enable-swap master Then merge the new rebase branch into next git checkout next git merge andrew/zram-support and correct the conflicts, commit and push the next branch to the public repository After that you can delete the andrew/enable-swap branch: git push origin --delete andrew/enable-swap Yves ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
