kicad-developers team mailing list archive

[Mark Roszko <mark.roszko@xxxxxxxxx>]

I forgot to add, if you trust the divergent branch (because I imagine
its cherry-picked commits etc from master).

Then just do a git checkout and specify niki's branch from the remote
and a local branch name in the command line. Then push that branch.
This will combine the two.