kicad-developers team mailing list archive

[Shane Burrell <shaneb@xxxxxxxxxxxxxxxx>]

If you really trust the branch and aren't concerned about history (prolly
messy anyways), just create a stable branch in your repo, and checkout a
clean from the remote to overlay your stable branch and push that.  More of
a replace than a merge.  That's likely the cleanest way to do it.  It would
be good to create standard branches of develop, release etc as defined in
the link sent earlier.

On Tue, Aug 23, 2016 at 9:42 AM, Mark Roszko <mark.roszko@xxxxxxxxx> wrote:

> 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@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp
>