juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 10:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tombstone resolution for 409 status code with error code -3 (#14116)

Browse Source 
* fix: tombstone resolution for 409 status code with error code -3

* fix: add resolution for undefined conflicts

* fix: generate setting id if it is empty for 409 tombstone

* fix: force push empty setting_id preset on 409 tombstone

* clearner solution
This commit is contained in:
Ian Chua
2026-06-10 22:23:12 +08:00
committed by GitHub
parent 3be36bdea4
commit 847807adac
5 changed files with 86 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/Utils/OrcaCloudServiceAgent.hpp
+2
View File
@@ -300,6 +300,8 @@ public:
bool set_user_session(const nlohmann::json& session_json, bool notify_login = true);
void clear_session();
static std::string generate_uuid_for_setting_id(const std::string& name, const std::string& user_id = "");
private:
// Sync protocol helpers
int sync_pull(