Patches

Yuriy Skalko yuriy.skalko at gmail.com
Sun Nov 8 08:20:39 UTC 2020


>> 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


I've rebased that cleanup branch on the current master (that already 
have that my patches). Please use "pull --rebase" to sync your local branch.


Yuriy


More information about the lyx-devel mailing list