|
From: | Charlie Jiang |
Subject: | Re: [GSoC] Merge Request - to master or to a seperate branch? |
Date: | Tue, 21 Jun 2022 14:40:14 +0800 |
User-agent: | Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 |
My conclusion: If it weren't for GSoC, your approach would be justfine. However, for the sake of having your code at one single place Iask you to use one or more working branches, with a cleaned-upreference branch holding logically organized commits as the final GSoCtarget.
I see. If I set up a parallel personal branch (gsoc-2022-chariri) cherry-picking my contributions, while new commits are still being merged, would it work? The parallel branch would serve the purpose of proof-of-contribution and it will be a logically organized single line.
The main concern is that, if the dev branch isn’t actively merged, it may end up being a huge merge-conflict hell at the end of the GSoC. Also, the code quality may lose control and end up like the previous GSoC project about ftinspect :( .
BTW, it might help setting up CI support for 'freetype-demos', and inparticular for `ftinspect`. Can you do that?
If it’s only for ftinspect
,
it’s fine since it requires few dependencies. Which platforms
are needed?
Cheers,
Charlie
[Prev in Thread] | Current Thread | [Next in Thread] |