Merge pull request #35 from serokell/notgne2/fix-settings-merge

Fix the order in which settings are merged

1 files changed, 2 insertions, 2 deletions

diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 5770f98..a891261 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -260,9 +260,9 @@ pub fn make_deploy_data<'a, 's>(
     profile_name: &'a str,
     cmd_overrides: &'a CmdOverrides,
 ) -> DeployData<'a> {
-    let mut merged_settings = top_settings.clone();
+    let mut merged_settings = profile.generic_settings.clone();
     merged_settings.merge(node.generic_settings.clone());
-    merged_settings.merge(profile.generic_settings.clone());
+    merged_settings.merge(top_settings.clone());
 
     if cmd_overrides.ssh_user.is_some() {
         merged_settings.ssh_user = cmd_overrides.ssh_user.clone();