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. _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
