Differences

This shows you the differences between two versions of the page.

--- dev:sqitch [2016/03/30 11:06] – erickson
+++ dev:sqitch [2022/02/10 13:34] (current) – external edit 127.0.0.1
@@ Line 87: / Line 87: @@
 </code>
-==== Resolving Conflicts / Developing With Multiple Branches ====
+==== Resolving Conflicts / Deploying Multiple Plan Files ====
 **AKA "Cannot find this change in sqitch.plan"**
@@ Line 142: / Line 142: @@
 The same steps will work when returning to the original branch w/ changes A, B, and C.
+=== The --merge option ===
+Version 1.1.0 of Sqitch [[https://github.com/theory/sqitch/issues/200|will support]] a --merge option to better handle situations where the plan file does not match the exact order of the events tracked in the Sqitch database.  (At time of writing, CPAN installs version 0.9994).  In theory, this will make it easier to use a single database for developing across multiple branches.