Skip to content

Commit 9d3487c

Browse files
committed
Clarifies Git merge base and target config key semantics
(#4443, #4522)
1 parent 2094d32 commit 9d3487c

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

src/constants.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,23 @@ export const enum CharCode {
4747
z = 122,
4848
}
4949

50+
/**
51+
* `gk-merge-target` means the branch that the current branch is most likely to be merged into, e.g.
52+
* - branch to compare with by default
53+
* - default target for creating a PR
54+
* - etc.
55+
*
56+
* `gk-merge-target-user` — merge target branch explicitly defined by user,
57+
* if it's defined we use this value instead of `gk-merge-target`, but we keep storing `gk-merge-target` value that was determined automatically.
58+
*
59+
* `gk-merge-base` means the branch that the current branch originates from, e.g. what was the base in the moment of creation.
60+
* This value is used for: ... (TODO describe use cases).
61+
*
62+
* `vscode-merge-base` — value determined by VS Code that is used to determine the merge base for the current branch.
63+
* once `gk-merge-base` is determined, we stop using `vscode-merge-base`
64+
*
65+
66+
*/
5067
export type GitConfigKeys =
5168
| `branch.${string}.vscode-merge-base`
5269
| `branch.${string}.gk-merge-base`

0 commit comments

Comments
 (0)