devbox_launcher 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1fc786af61f55bf9d437475367c702ffd752c96e4bb00c2bd033e45eb939878
-  data.tar.gz: 598cba8e569b9a44311dd70e938ef62659574fd110efa764c644db96c2bad2c0
+  metadata.gz: 7dba24702fd7a8544853fb57f70e2eacefde9baaad77c89395e02386a7cb8f8e
+  data.tar.gz: c1429492e09d53cb713aff3350dc9f9bb1493cfde9f3ab5b13661e55a0ae9cfd
 SHA512:
-  metadata.gz: b3724e11198243e0a29b9a902e09902a040d0b5011da0d2e6db23a37696ba07a39109f602bb68e1a09456e350eca62d4eb37b8cb87e984927acf7f880a41e6f3
-  data.tar.gz: 4692fd01fb512aafdbdc9674c911e73128ae4bb7b7e1b270b98ae706065ee88e4efcedf40776136db86060839acf0aec1d24b9f139467e18991d9afa5c2dc8b9
+  metadata.gz: 1a2575b81a0874f3feeae362f34629ac12dc911a10724304ad7a02ce9e682c030f0c1be9219c4f54a59dcd84a289163e040c256cc56c85c84ca54894d6058b5b
+  data.tar.gz: b4de4abcd93eef4da20fa422ddc1f19613cb8d3d9faa6415ddfd32eabf68fd5a10c3bb0f1df0e1191bb64491e3ba6b4256c0218ac9a75631023c91bf7d014fe0

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.1] - 2022-04-25
+### Fixed
+- Conflicts between beta and alpha
+
 ## [1.1.0] - 2022-04-18
 ### Changed
 - Ignore version control system directories like `.git`. You will be unable to use git in the remote machine.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devbox_launcher (1.1.0)
+    devbox_launcher (1.1.1)
       activesupport (~> 6.0)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)

data/lib/devbox_launcher/models/mutagen_session.rb

@@ -38,6 +38,7 @@ module DevboxLauncher
         config.alpha_dir,
         "#{hostname}:#{config.beta_dir}",
         "--label=#{label}",
+        "--sync-mode=two-way-resolved",
         "--ignore-vcs",
         "--ignore=.DS_Store"
       ]

data/lib/devbox_launcher/version.rb

@@ -1,3 +1,3 @@
 module DevboxLauncher
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devbox_launcher
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler