Version-control and history tabs
Version-control operations and deployment history each have their own tabs, opened from the menus. This page lists what's there and what each is for; specifics of each action (commit, push, compare) belong to the per-tab documentation that lives in the app itself.
Version-control tabs: Git workspaces
Open from the Version Control menu.
| Tab | What it shows |
|---|---|
| Outgoing | Local commits that haven't been pushed to the remote. |
| Incoming | Commits on the remote that haven't been pulled. |
| Stash | Local stashes. |
| Manage Branches | Branch management: create, switch, delete. |
Menu also has direct actions that don't open a tab:
- Pull / Fetch. Background commands.
- Connection…. Opens the version-control connection dialog.
Version-control tabs: TFS workspaces
Open from the Version Control menu.
| Tab | What it shows |
|---|---|
| Pending Changes | Workspace changes not yet checked in. |
| Incoming Changes | Changesets on the server not yet pulled. |
| History | Committed changesets. |
Menu also has Get Latest (pull) and Connection….
Component-level VCS tabs
From the component grid's right-click Version Control submenu you can open two per-component tabs:
- Show Diff. Opens a dedicated diff tab for the selected component.
- View History. Opens a dedicated history tab showing the commit log that touched this file.
Other submenu entries (Revert Changes, Commit… / Check In…, Pull / Get Latest, Fetch) are commands that run in-place rather than opening tabs.
The Deployment History tab
Not a version-control view, but thematically related: the history of deployments run through DataStar.
Open with Deployment → History. Each row is one past deployment with a summary; expand a row to see the deployed components and the log. Actions from history include reversing or re-running a past deployment.
For the reversal flow see the Release Workflow and, when the reversal guide ships, the dedicated page.
Conflict merge
When a pull / switch / merge produces conflicts, DataStar's conflict-merge window opens automatically. It shows the three-way view (Ours / Theirs / Merged Result) with toolbar actions Use All Ours, Use All Theirs, Accept Merge, and Cancel. The merged-result pane is editable; you can resolve by hand, then click Accept Merge.
Separately, when you switch branches with uncommitted changes, the Uncommitted Changes dialog offers Stash, Force Switch, or Cancel.