On 11/7/20 10:06 AM, Yuriy Skalko wrote: >> Toward that end, I've created a features/cleanup/updateMacros branch >> and committed a very small piece. The first step, for me, is to >> figure out how this stuff works! >> >> Riki > > Should I commit my recent patches into this branch?
Sure. > What is the way LyX project uses for updating feature branches: > rebasing on master, merging master or cherry-picking needed commits? When it comes time to commit, I think people usually just rebase on master, then merge. But we haven't used feature branches that often. I'll probably rebase it periodically, so that doesn't become too difficult later. Do you want me to create new branches for that, or just rewrite the history? Riki -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
