① Start Task (gitlane.startTask): Syncs develop from remote (fast-forward only) and creates YYYYMMDD_task using your local timezone date. Offers auto-stash if there are uncommitted changes.
② Merge to develop (gitlane.mergeToDevelop): Verifies clean working tree and non-protected branch, merges into develop (--no-ff), pushes to remote, and lets you delete or keep the task branch.
③ Release to master (gitlane.releaseToMaster): Syncs develop and master, previews up to 5 ahead commits, merges into master, pushes, and optionally switches back to develop.
Conflict Guardrail & Manager (gitlane.openConflictManager): Immediately stops on merge conflicts and opens an IntelliJ-style Conflict Manager panel with per-file resolution status, explicit branch-labeled one-click actions (Keep target / Apply incoming), VS Code 3-Way Merge Editor integration, Complete Merge, and Abort Merge.
Status Bar Indicators
State
Status Bar Text
Click Action
Merge conflict in progress
GitLane: 머지 충돌 중 (Warning)
Opens Conflict Resolution Menu
master (uncommitted changes)
GitLane: master (운영) (Warning)
Opens Workflow Menu
master (clean)
GitLane: master (운영)
Opens Workflow Menu
develop
GitLane: develop (스테이지)
Opens Workflow Menu
Task branch
GitLane: <branch-name>
Opens Workflow Menu
Repository Configuration (.gitlane.json)
Place .gitlane.json at your repository root to share identical rules across VS Code and IntelliJ IDEA (takes precedence over IDE settings):