Skip to content

Commit 0b32f2c

Browse files
committed
fix: resolve merge conflicts in documentation files
1 parent df23f80 commit 0b32f2c

File tree

8 files changed

+36
-1941
lines changed

8 files changed

+36
-1941
lines changed

CLAUDE.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22

33
## Build & Run Commands
44

5-
<<<<<<< Updated upstream
65
```bash
7-
=======
8-
<<<<<<< HEAD
9-
``` bash
10-
=======
11-
```bash
12-
>>>>>>> chore/bisect
13-
>>>>>>> Stashed changes
146
# Build
157
cargo build
168

@@ -35,15 +27,7 @@ cargo clippy
3527

3628
## CLI Examples
3729

38-
<<<<<<< Updated upstream
39-
```bash
40-
=======
41-
<<<<<<< HEAD
42-
``` bash
43-
=======
4430
```bash
45-
>>>>>>> chore/bisect
46-
>>>>>>> Stashed changes
4731
# List instances
4832
cargo run -- instances list
4933

README.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,7 @@ cargo run
7474

7575
A VyOS test lab environment is provided for testing bbctl against real infrastructure. The lab uses Docker to create VyOS routers configured with WireGuard, VXLAN, OSPF, and L3VPN to simulate a multi-tenant network environment.
7676

77-
<<<<<<< Updated upstream
7877
```bash
79-
=======
80-
<<<<<<< HEAD
81-
``` bash
82-
=======
83-
```bash
84-
>>>>>>> chore/bisect
85-
>>>>>>> Stashed changes
8678
# Setup the VyOS test lab
8779
cd tests/vyos-lab
8880
./setup-lab.sh
@@ -94,7 +86,6 @@ bbctl test-vyos --host localhost --port 21022 --username vyos --api-key bbctl-te
9486
./cleanup-lab.sh
9587
```
9688

97-
<<<<<<< HEAD
9889
For more information about the test lab, see [tests/vyos-lab/README.md] or the [VyOS Test Lab Setup] documentation.
9990

10091
[tests/vyos-lab/README.md]: tests/vyos-lab/README.md
@@ -141,9 +132,6 @@ For more examples and detailed usage instructions, see the [User Guide] and [Com
141132

142133
[User Guide]: docs/user-guide.md
143134
[Command Reference]: docs/command-reference.md
144-
=======
145-
For more information about the test lab, see [tests/vyos-lab/README.md](tests/vyos-lab/README.md).
146-
>>>>>>> chore/bisect
147135

148136
## License
149137

docs/ARCHITECTURE_DESIGN.md

Lines changed: 6 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,7 @@ bbctl/
135135

136136
The `Provider` trait defines the common interface for all infrastructure providers:
137137

138-
<<<<<<< Updated upstream
139-
```rust
140-
=======
141-
<<<<<<< HEAD
142-
``` rust
143-
=======
144-
```rust
145-
>>>>>>> chore/bisect
146-
>>>>>>> Stashed changes
138+
```bash
147139
pub trait Provider {
148140
/// Connect to the provider
149141
fn connect(&self) -> Result<()>;
@@ -170,15 +162,7 @@ The Proxmox API client supports: - REST API integration for VM management - Reso
170162

171163
Represents virtual machines and containers:
172164

173-
<<<<<<< Updated upstream
174-
```rust
175-
=======
176-
<<<<<<< HEAD
177-
``` rust
178-
=======
179-
```rust
180-
>>>>>>> chore/bisect
181-
>>>>>>> Stashed changes
165+
```bash
182166
pub struct Instance {
183167
pub id: Uuid,
184168
pub name: String,
@@ -198,15 +182,7 @@ pub struct Instance {
198182

199183
Represents storage volumes:
200184

201-
<<<<<<< Updated upstream
202-
```rust
203-
=======
204-
<<<<<<< HEAD
205-
``` rust
206-
=======
207-
```rust
208-
>>>>>>> chore/bisect
209-
>>>>>>> Stashed changes
185+
```bash
210186
pub struct Volume {
211187
pub id: Uuid,
212188
pub name: String,
@@ -228,15 +204,7 @@ pub struct Volume {
228204

229205
Represents virtual networks:
230206

231-
<<<<<<< Updated upstream
232-
```rust
233-
=======
234-
<<<<<<< HEAD
235-
``` rust
236-
=======
237-
```rust
238-
>>>>>>> chore/bisect
239-
>>>>>>> Stashed changes
207+
```bash
240208
pub struct Network {
241209
pub id: Uuid,
242210
pub name: String,
@@ -263,15 +231,7 @@ pub struct Network {
263231

264232
Manages infrastructure providers, their credentials, and connections:
265233

266-
<<<<<<< Updated upstream
267-
```rust
268-
=======
269-
<<<<<<< HEAD
270-
``` rust
271-
=======
272-
```rust
273-
>>>>>>> chore/bisect
274-
>>>>>>> Stashed changes
234+
```bash
275235
pub struct ProviderService {
276236
providers: Providers,
277237
credentials: Credentials,
@@ -282,15 +242,7 @@ pub struct ProviderService {
282242

283243
Handles VM/container lifecycle operations:
284244

285-
<<<<<<< Updated upstream
286-
```rust
287-
=======
288-
<<<<<<< HEAD
289-
``` rust
290-
=======
291-
```rust
292-
>>>>>>> chore/bisect
293-
>>>>>>> Stashed changes
245+
```bash
294246
pub struct InstanceService {
295247
storage: InstanceStorage,
296248
provider_service: ProviderService,

docs/api-readme.md

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,7 @@ The API schema is defined using [Zod], a TypeScript-first schema validation libr
2222

2323
### Installation
2424

25-
<<<<<<< Updated upstream
2625
```bash
27-
=======
28-
<<<<<<< HEAD
29-
``` bash
30-
=======
31-
```bash
32-
>>>>>>> chore/bisect
33-
>>>>>>> Stashed changes
3426
cd bitbuilder.io/bbctl
3527
bun install
3628
```
@@ -39,15 +31,7 @@ bun install
3931

4032
To generate the OpenAPI schema and documentation:
4133

42-
<<<<<<< Updated upstream
43-
```bash
44-
=======
45-
<<<<<<< HEAD
46-
``` bash
47-
=======
4834
```bash
49-
>>>>>>> chore/bisect
50-
>>>>>>> Stashed changes
5135
bun run generate-openapi
5236
```
5337

@@ -61,15 +45,7 @@ Open `api-docs/index.html` in your browser to view the interactive API documenta
6145

6246
You can use the Zod schemas to validate data at runtime:
6347

64-
<<<<<<< Updated upstream
65-
```typescript
66-
=======
67-
<<<<<<< HEAD
68-
``` typescript
69-
=======
7048
```typescript
71-
>>>>>>> chore/bisect
72-
>>>>>>> Stashed changes
7349
import { InstanceSchema } from './schema.js';
7450

7551
// Data from API or user input
@@ -94,15 +70,7 @@ try {
9470

9571
The schemas also provide TypeScript types:
9672

97-
<<<<<<< Updated upstream
9873
```typescript
99-
=======
100-
<<<<<<< HEAD
101-
``` typescript
102-
=======
103-
```typescript
104-
>>>>>>> chore/bisect
105-
>>>>>>> Stashed changes
10674
import { Instance, InstanceStatus } from './schema.js';
10775

10876
// Type-safe instance object
@@ -154,15 +122,7 @@ The OpenAPI documentation can be used to generate clients in various languages u
154122

155123
For example, to generate a TypeScript client:
156124

157-
<<<<<<< Updated upstream
158-
```bash
159-
=======
160-
<<<<<<< HEAD
161-
``` bash
162-
=======
163125
```bash
164-
>>>>>>> chore/bisect
165-
>>>>>>> Stashed changes
166126
bunx --bun @openapitools/openapi-generator-cli generate \
167127
-i api-docs/openapi.json \
168128
-g typescript-axios \

0 commit comments

Comments
 (0)