[Development] how to include further changes while previous commit is still under review?

Samuel Gaist samuel.gaist at edeltech.ch
Thu Jan 18 23:58:19 CET 2018


> On 18 Jan 2018, at 22:42, Daniel Savi <daniel.savi at gaess.ch> wrote:
> 
> Hello qt devs
> 
> I'm back with another newbie question. I have committed a patch that is still under review on gerrit.
> 
> Meanwhile, I've got a local and unrelated patch on the same file, that I would like to commit, too.
> 
> Now, how would I include this patch into my local git repo and how would I commit it as a separate patch to the first?
> 
> How could I still work on the first patch, once more comments are coming in?
> 
> Would I create separate branches?
> 
> Sorry for my very basic level of git-foo.
> 
> _______________________________________________
> Development mailing list
> Development at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development

Hi,

Since the patch is unrelated, use a different topic branch for that one and submit it like the other one.

Depending on the impact of your change, you might want to look at https://git-scm.com/docs/git-worktree and have a separate build for it.

Cheers

Samuel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Message signed with OpenPGP
URL: <http://lists.qt-project.org/pipermail/development/attachments/20180118/7b04aae5/attachment.sig>


More information about the Development mailing list