Hey Dietmar, On Tue, Aug 24, 2021 at 05:34:28PM -0400, Dietmar May wrote: > 6477: aarch64: reg cmd w/ force for rd & wr, sync | > https://review.openocd.org/c/openocd/+/6477 > > There's a big red Merge Conflict badge, which states "This change has merge > conflicts. Download the patch and run git rebase".
Don't worry. Default merge strategy in OpenOCD Gerrit instance is "cherry-pick" so it doesn't consider other patches in the chain when checking if it can be merged. Of course the maintainers will take care to do it in the right order when submitting. > All commits compile successfully under jenkins. Then it's all fine. Thank you for contributing! -- Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software! mailto:[email protected]
