On 05.08.2018 13:33, Svetoslav Enchev wrote:
However, I created a Merge Conflict with this patch:
7d62a54ea0866e59a5bfe0f850dde0a7090deeab "flash/at91sam4: different
erase sector and lock region sizes" and I'm not sure what I should do
about it. It conflicts with the previous patch I made: they are
logically different changes, but touch the same code. Should I somehow
try to make the second patch work without the first?
3 years ago I asked a similar question. Here is Paul Fertser's reply:
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.
Tom
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel
