bullet_train 1.5.0 → 1.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/docs/upgrades/notable-versions.md +13 -0
- data/lib/bullet_train/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 28b3ba5f50dac3b25183a892b754c22e23ff75a757293050c3124401037e5fd9
|
|
4
|
+
data.tar.gz: 20c4f020b91dabe7a2bc85f006de605d187d71a943976a2f6eeb729cebb2dba5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 88d77c764443e6de40f3ef8187c0add73aa76b4a3d1fc605dabba7335031a227b280d7db58ebf4ec5f4baf8087e9d1e1b54e3d364bccd5332337e2a23638ac74
|
|
7
|
+
data.tar.gz: d12805a0a7a1bfb764e867d03d898062ea67423882786805ce60407fc5176eabacc10dbc94654f96279bde26cb38d3bfdb3c20ddd5f3a73323a492df43bec6ea
|
|
@@ -18,6 +18,19 @@ Then you should:
|
|
|
18
18
|
* Commit the updated test files
|
|
19
19
|
* Update to v1.5.0
|
|
20
20
|
|
|
21
|
+
### Dealing with merge conflicts after merging v1.5.0
|
|
22
|
+
|
|
23
|
+
When you update to 1.5.0 you may have rather large merge conflicts in some system test files,
|
|
24
|
+
especially if you've modified those files to accomodate changes to user flows in your own app.
|
|
25
|
+
|
|
26
|
+
When you're resolving conflicts you'll mostly want to pick your own version of stuff (that is,
|
|
27
|
+
the code on the `HEAD` side of the conflict). If you want to avoid manually sorting a conflict
|
|
28
|
+
and just preserve your own version of a file you can do something like this:
|
|
29
|
+
|
|
30
|
+
```
|
|
31
|
+
git checkout HEAD -- test/system/the_test_file_in_question.rb
|
|
32
|
+
```
|
|
33
|
+
|
|
21
34
|
### About this change
|
|
22
35
|
|
|
23
36
|
We've introduced a new `device_test` helper that wraps up some of the implementation
|
data/lib/bullet_train/version.rb
CHANGED