Skip to content

Commit c6b8941

Browse files
sreyasreya
committed
why does a generated file retain git conflicts??
1 parent ed7e0e8 commit c6b8941

File tree

2 files changed

+0
-91
lines changed

2 files changed

+0
-91
lines changed

‎cmd/coder/coder

62 MB
Binary file not shown.

‎site/src/api/typesGenerated.ts

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// Code generated by 'make coder/scripts/apitypings/main.go'. DO NOT EDIT.
22

3-
<<<<<<< HEAD
4-
// From codersdk/workspaceagents.go:36:6
5-
=======
63
// From codersdk/users.go:49:6
74
export interface APIKey {
85
readonly id: string
@@ -16,7 +13,6 @@ export interface APIKey {
1613
}
1714

1815
// From codersdk/workspaceagents.go:35:6
19-
>>>>>>> make gen
2016
export interface AWSInstanceIdentityToken {
2117
readonly signature: string
2218
readonly document: string
@@ -28,11 +24,6 @@ export interface AgentGitSSHKey {
2824
readonly private_key: string
2925
}
3026

31-
<<<<<<< HEAD
32-
// From codersdk/users.go:156:6
33-
=======
34-
// From codersdk/users.go:169:6
35-
>>>>>>> make gen
3627
export interface AuthMethods {
3728
readonly password: boolean
3829
readonly github: boolean
@@ -57,33 +48,18 @@ export interface ComputedParameter extends Parameter {
5748
readonly default_source_value: boolean
5849
}
5950

60-
<<<<<<< HEAD
61-
// From codersdk/users.go:47:6
62-
=======
63-
// From codersdk/users.go:60:6
64-
>>>>>>> make gen
6551
export interface CreateFirstUserRequest {
6652
readonly email: string
6753
readonly username: string
6854
readonly password: string
6955
readonly organization: string
7056
}
7157

72-
<<<<<<< HEAD
73-
// From codersdk/users.go:55:6
74-
=======
75-
// From codersdk/users.go:68:6
76-
>>>>>>> make gen
7758
export interface CreateFirstUserResponse {
7859
readonly user_id: string
7960
readonly organization_id: string
8061
}
8162

82-
<<<<<<< HEAD
83-
// From codersdk/users.go:151:6
84-
=======
85-
// From codersdk/users.go:164:6
86-
>>>>>>> make gen
8763
export interface CreateOrganizationRequest {
8864
readonly name: string
8965
}
@@ -122,11 +98,6 @@ export interface CreateTemplateVersionRequest {
12298
readonly parameter_values?: CreateParameterRequest[]
12399
}
124100

125-
<<<<<<< HEAD
126-
// From codersdk/users.go:60:6
127-
=======
128-
// From codersdk/users.go:73:6
129-
>>>>>>> make gen
130101
export interface CreateUserRequest {
131102
readonly email: string
132103
readonly username: string
@@ -151,11 +122,6 @@ export interface CreateWorkspaceRequest {
151122
readonly parameter_values?: CreateParameterRequest[]
152123
}
153124

154-
<<<<<<< HEAD
155-
// From codersdk/users.go:147:6
156-
=======
157-
// From codersdk/users.go:160:6
158-
>>>>>>> make gen
159125
export interface GenerateAPIKeyResponse {
160126
readonly key: string
161127
}
@@ -173,21 +139,11 @@ export interface GoogleInstanceIdentityToken {
173139
readonly json_web_token: string
174140
}
175141

176-
<<<<<<< HEAD
177-
// From codersdk/users.go:136:6
178-
=======
179-
// From codersdk/users.go:149:6
180-
>>>>>>> make gen
181142
export interface LoginWithPasswordRequest {
182143
readonly email: string
183144
readonly password: string
184145
}
185146

186-
<<<<<<< HEAD
187-
// From codersdk/users.go:142:6
188-
=======
189-
// From codersdk/users.go:155:6
190-
>>>>>>> make gen
191147
export interface LoginWithPasswordResponse {
192148
readonly session_token: string
193149
}
@@ -330,11 +286,6 @@ export interface UpdateActiveTemplateVersion {
330286
readonly id: string
331287
}
332288

333-
<<<<<<< HEAD
334-
// From codersdk/users.go:76:6
335-
=======
336-
// From codersdk/users.go:89:6
337-
>>>>>>> make gen
338289
export interface UpdateRoles {
339290
readonly roles: string[]
340291
}
@@ -346,21 +297,11 @@ export interface UpdateTemplateMeta {
346297
readonly min_autostart_interval_ms?: number
347298
}
348299

349-
<<<<<<< HEAD
350-
// From codersdk/users.go:71:6
351-
=======
352-
// From codersdk/users.go:84:6
353-
>>>>>>> make gen
354300
export interface UpdateUserPasswordRequest {
355301
readonly old_password: string
356302
readonly password: string
357303
}
358304

359-
<<<<<<< HEAD
360-
// From codersdk/users.go:67:6
361-
=======
362-
// From codersdk/users.go:80:6
363-
>>>>>>> make gen
364305
export interface UpdateUserProfileRequest {
365306
readonly username: string
366307
}
@@ -380,11 +321,6 @@ export interface UploadResponse {
380321
readonly hash: string
381322
}
382323

383-
<<<<<<< HEAD
384-
// From codersdk/users.go:37:6
385-
=======
386-
// From codersdk/users.go:39:6
387-
>>>>>>> make gen
388324
export interface User {
389325
readonly id: string
390326
readonly email: string
@@ -395,58 +331,31 @@ export interface User {
395331
readonly roles: Role[]
396332
}
397333

398-
<<<<<<< HEAD
399-
// From codersdk/users.go:101:6
400-
=======
401-
// From codersdk/users.go:114:6
402-
>>>>>>> make gen
403334
export interface UserAuthorization {
404335
readonly object: UserAuthorizationObject
405336
readonly action: string
406337
}
407338

408-
<<<<<<< HEAD
409-
// From codersdk/users.go:117:6
410-
=======
411-
// From codersdk/users.go:130:6
412-
>>>>>>> make gen
413339
export interface UserAuthorizationObject {
414340
readonly resource_type: string
415341
readonly owner_id?: string
416342
readonly organization_id?: string
417343
readonly resource_id?: string
418344
}
419345

420-
<<<<<<< HEAD
421-
// From codersdk/users.go:90:6
422-
=======
423-
// From codersdk/users.go:103:6
424-
>>>>>>> make gen
425346
export interface UserAuthorizationRequest {
426347
readonly checks: Record<string, UserAuthorization>
427348
}
428349

429-
<<<<<<< HEAD
430-
// From codersdk/users.go:85:6
431-
export type UserAuthorizationResponse = Record<string, boolean>
432-
433-
// From codersdk/users.go:80:6
434-
=======
435350
// From codersdk/users.go:98:6
436351
export type UserAuthorizationResponse = Record<string, boolean>
437352

438353
// From codersdk/users.go:93:6
439-
>>>>>>> make gen
440354
export interface UserRoles {
441355
readonly roles: string[]
442356
readonly organization_roles: Record<string, string[]>
443357
}
444358

445-
<<<<<<< HEAD
446-
// From codersdk/users.go:25:6
447-
=======
448-
// From codersdk/users.go:31:6
449-
>>>>>>> make gen
450359
export interface UsersRequest extends Pagination {
451360
readonly q?: string
452361
}

0 commit comments

Comments
 (0)