Hi Morgan, 2952 cannot be merged until merge of 3091 (creating atsamv.cfg) BTW Good work...
Quoting reply from Paul Ferster to similar question: > Hi, > > On Thu, Sep 24, 2015 at 01:16:06PM +0200, Tomas Vanek wrote: >> can anybody explain me why gerrit web shows "Cannot Merge" message? >> I rebased all 3 dependent changes and gerrit insists on "Cannot Merge". >> The change merges in my local git without any problem >> and jenkins has verified it ok. > The Gerrit merge policy is set to cherry-pick, so it considers every > "Change" in isolation. Of course all of your patches but the first one > cannot be merged before their dependencies are merged. > > Just do not worry about it. On 04.11.2015 2:55, Morgan Quigley (Code Review) wrote: > Morgan Quigley has posted comments on this change. > > Change subject: flash: driver for Atmel SAMV, SAMS, and SAME > ...................................................................... > > > Patch Set 13: > > Hi friends, > > So... I don't know what's happening :) This shows "Cannot Merge" on the web > page right now, but alas, I don't know why. This patch now depends on the > other patches, and then modifies tcl/target/atsamv.cfg which was added in a > previous patch to add the flash bank configuration using this "new" driver. > Perhaps I have rebased it incorrectly? I'd love to learn what I'm doing > wrong. Thanks! Cheers! > ------------------------------------------------------------------------------ _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
