Dequeue changes immediately on merge conflicts
Change-Id: I4a2b9c5bc3a5659e874fe2bccbbd61da01713b9a
diff --git a/NEWS.rst b/NEWS.rst
index fd0c32b..4aeacb9 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -11,3 +11,9 @@
context for why the change is being run (including the pipeline,
items ahead and behind, etc.). The Change is still available via
the "change" attribute on the QueueItem.
+
+* The default behavior is now to immediately dequeue changes that have
+ merge conflicts, even those not at the head of the queue. To enable
+ the old behavior (which would wait until the conflicting change was
+ at the head before dequeuing it), see the new "dequeue-on-conflict"
+ option.