Merge pull request #385 from contentstack/fix/dx-3231

Fixed branch header conflits issue

Author: sunil-lakshman

.gitignore

@@ -67,4 +67,5 @@ tsconfig.json
 .next
 .dccache
 dist
-jsdocs
+jsdocs
+.early.coverage

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## [v1.21.8](https://github.com/contentstack/contentstack-management-javascript/tree/v1.21.8) (2025-07-07)
+ - Fix
+   - Fixed branch header conflits
 ## [v1.21.7](https://github.com/contentstack/contentstack-management-javascript/tree/v1.21.7) (2025-06-30)
  - Fix
    - Fixed Request-URI Too Large error

lib/stack/index.js

@@ -168,8 +168,8 @@ export function Stack (http, data) {
     this.globalField = (uidOrOptions = null, option = {}) => {
       let globalFieldUid = null
       let apiVersion = '3.0'
-      let branch = 'main'
       const stackHeaders = { ...this.stackHeaders }
+      let branch = stackHeaders.branch || http.defaults.headers.branch || 'main'
       if (typeof uidOrOptions === 'object' && uidOrOptions !== null) {
         option = uidOrOptions
       } else {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/management",
-  "version": "1.21.7",
+  "version": "1.21.8",
   "description": "The Content Management API is used to manage the content of your Contentstack account",
   "main": "./dist/node/contentstack-management.js",
   "browser": "./dist/web/contentstack-management.js",