fix: resource update when conflict

Signed-off-by: asingh51 <[email protected]>
argoproj · Feb 3, 2025 · 869c9be · 869c9be
1 parent 0f47dab
commit 869c9be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/argocd/commands/admin/backup_test.go b/cmd/argocd/commands/admin/backup_test.go
@@ -85,6 +85,7 @@ func Test_updateTracking(t *testing.T) {
 		})
 	}
 }
+
 func TestIsSkipLabelMatches(t *testing.T) {
 	tests := []struct {
 		name       string
@@ -156,4 +157,4 @@ func TestIsSkipLabelMatches(t *testing.T) {
 			assert.Equal(t, tt.expected, result)
 		})
 	}
-}
+}
diff --git a/docs/user-guide/commands/argocd_admin_import.md b/docs/user-guide/commands/argocd_admin_import.md