workcontrolgit
diff --git a/‎.claude/settings.local.json‎
Lines changed: 3 additions & 1 deletion b/‎.claude/settings.local.json‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎ApiResources/TalentManagement-API‎ b/‎ApiResources/TalentManagement-API‎
diff --git a/‎Clients/TalentManagement-Angular-Material‎ b/‎Clients/TalentManagement-Angular-Material‎
diff --git a/‎TokenService/Duende-IdentityServer‎ b/‎TokenService/Duende-IdentityServer‎
@@ -2,7 +2,9 @@
   "permissions": {
     "allow": [
       "Bash(mv:*)",
-      "Bash(git submodule add:*)"
+      "Bash(git submodule add:*)",
+      "Bash(git pull:*)",
+      "Bash(git merge:*)"
     ],
     "deny": [],
     "ask": []