dev:sqitch
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
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: | ||
</ | </ | ||
- | ==== Resolving Conflicts / Developing With Multiple | + | ==== Resolving Conflicts / Deploying |
**AKA " | **AKA " | ||
Line 142: | Line 142: | ||
The same steps will work when returning to the original branch w/ changes A, B, and C. | 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:// | ||
dev/sqitch.txt · Last modified: 2022/02/10 13:34 by 127.0.0.1