Fixing merge conflicts

SupperZum · May 6, 2024 · 90bd73c · 90bd73c
1 parent 00a0aa2
commit 90bd73c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/module/move/willbe/src/entity/package.rs b/module/move/willbe/src/entity/package.rs
@@ -454,7 +454,7 @@ mod private
     let bump_report = version::version_bump( version_bump ).map_err( | e | ( report.clone(), e ) )?;
     report.bump = Some( bump_report.clone() );
     let git_root = git_things.git_root.clone();
-    let git = match perform_git_commit( git_things ).map_err( | e | ( report.clone(), e ) )
+    let git = match perform_git_commit( git_things )
     {
       Ok( git ) => git,
       Err( e ) =>
@@ -466,7 +466,7 @@ mod private
     };
     report.add = git.add;
     report.commit = git.commit;
-    report.publish = match cargo::publish( publish ).map_err( | e | ( report.clone(), e ) )
+    report.publish = match cargo::publish( publish )
     {
       Ok( publish ) => Some( publish ),
       Err( e ) =>

diff --git a/module/move/willbe/src/tool/graph.rs b/module/move/willbe/src/tool/graph.rs
@@ -269,6 +269,7 @@ pub( crate ) mod private
           .path( package.crate_dir().absolute_path().as_ref().to_path_buf() )
           .option_temp_path( temp_path.clone() )
           .dry( false )
+          .allow_dirty( true )
           .form()
         )?;
         if publish_need( package, temp_path.clone() ).unwrap()