Re: wiki for merging gerrit changes for jenkins failures on patches

2021-08-24 Thread Andreas Fritiofson
Hi, On Tue, Aug 24, 2021 at 6:40 PM Dietmar May wrote: > I uploaded a series of (basically independent) commits (ie. patchsets). > > Code compiles, but jenkins fails for code style issues (whitespace, line > length). > > All of the wikis I've seen, including the openocd patch guide, say to > > g

Re: wiki for merging gerrit changes for jenkins failures on patches

2021-08-24 Thread Paul Fertser
Hello, On Tue, Aug 24, 2021 at 12:38:35PM -0400, Dietmar May wrote: > So it looks like the correct way to handle multiple patches is to create a > separate local branch for each independent patchset Yes. > Is there a simpler, or better, strategy? Yes, "git rebase -i origin/master" will let you

wiki for merging gerrit changes for jenkins failures on patches

2021-08-24 Thread Dietmar May
I uploaded a series of (basically independent) commits (ie. patchsets). Code compiles, but jenkins fails for code style issues (whitespace, line length). All of the wikis I've seen, including the openocd patch guide, say to git commit --amend git push review However, --amend only works with