← Back to team overview

kicad-developers team mailing list archive

Re: Advice on merge request


Hi Brian,

For the first question, you could cherry-pick all the commits from
Alexander's merge request onto your own feature branch (rebasing your own
commits on top of his).
Once his MR is merged, you can just rebase your branch on top of latest
master, dropping the cherry-picked commits and just keeping your own.
Then, open your own merge request. Does that make sense?

I see no problem directing people to your fork/testing branch to compile
and test on their own.
Providing pre-compiled binaries of your branch is a bit more risky as it
could potentially result in people forgetting they have it installed, then
opening bug reports with version info that makes no sense.
My input here is only a suggestion, but my suggestion is to do as much
testing as possible with users who are also able to compile KiCad from
source, and then wait to collect wider feedback until your proposed changes
have been approved by the development team, merged, and are available in
nightly builds.  It's always possible for you to do follow-on merge
requests to make any additional changes you desire after your initial
feature has been merged.


On Sat, Jan 4, 2020 at 11:43 AM Brian Piccioni <brian@xxxxxxxxxxxxxxxxxxxxx>

> Hello
> I have been working on Geographical reannotation. It uses the code
> Alexander Shuklin created for back annotation. I understand Alexander's
> merge request has been pending (yes, I know it is holidays) but now I
> don't know how to proceed because my code depends on his code.
> Any suggestions would be welcomed.
> Also, I have a user base of people who have been using my standalone
> RenumKicadPCB utility. I would like to direct them to my fork and/or
> pre-compiled Windows exes so they can help test it. It turns out there
> are lots of ways a project can be made with reference designation issues
> in the schematic and/or PCB so I would like to be sure I catch them all.
> I would, of course, flag that this is not an official Kicad release, etc..
> Any objections/suggestions?
> thanks
> Brian Piccioni
> _______________________________________________
> 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

Follow ups