@phpsandbox/sdk 0.6.0-canary.1 → 0.6.0-canary.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/git.d.ts +6 -0
- package/package.json +1 -1
package/dist/git.d.ts
CHANGED
|
@@ -130,17 +130,22 @@ export type GitMergeInput = GitRemoteSource & {
|
|
|
130
130
|
token?: string;
|
|
131
131
|
ref?: string;
|
|
132
132
|
expectedBaseRef?: string;
|
|
133
|
+
/** Apply only changes after this source checkpoint, using three-way conflict detection. Requires runtime baselineRef support. */
|
|
134
|
+
baselineRef?: string;
|
|
133
135
|
author?: string;
|
|
134
136
|
message?: string;
|
|
135
137
|
};
|
|
136
138
|
export type GitMergeResult = {
|
|
137
139
|
status: 'merged';
|
|
140
|
+
/** Confirms that the runtime applied the requested baseline delta. */
|
|
141
|
+
baselineRef?: string;
|
|
138
142
|
message: string;
|
|
139
143
|
baseRef: string;
|
|
140
144
|
targetRef: string;
|
|
141
145
|
ref: string;
|
|
142
146
|
} | {
|
|
143
147
|
status: 'conflict';
|
|
148
|
+
baselineRef?: string;
|
|
144
149
|
message: string;
|
|
145
150
|
baseRef: string;
|
|
146
151
|
targetRef: string;
|
|
@@ -152,6 +157,7 @@ export type GitMergeResult = {
|
|
|
152
157
|
baseRef: string;
|
|
153
158
|
} | {
|
|
154
159
|
status: 'up_to_date' | 'unrelated';
|
|
160
|
+
baselineRef?: string;
|
|
155
161
|
message: string;
|
|
156
162
|
baseRef: string;
|
|
157
163
|
targetRef: string;
|