@@ -8,16 +8,23 @@ Discord"](https://img.shields.io/badge/join-us%20on%20Discord-gray.svg?longCache
88Follow] ( https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social )] ( https://twitter.com/coderhq )
99[ ![ codecov] ( https://codecov.io/gh/coder/coder/branch/main/graph/badge.svg?token=TNLW3OAP6G )] ( https://codecov.io/gh/coder/coder )
1010
11+ <<<<<<< HEAD
1112<<<<<<< HEAD
1213Team-wide CLI for spawning up dev servers on demand, powered by Terraform.
1314||||||| parent of 059e6c7a (Add logos)
1415Provision remote development environments with Terraform.
1516=======
1617Provision remote development environments anywhere on anything.
1718>>>>>>> 059e6c7a (Add logos)
19+
20+ Provision remote development environments anywhere on anything.
21+ =======
22+ Provision remote development servers anywhere on anything.
23+ >>>>>>> b6574d34 (Integrate Ben's improvements)
1824
1925![ Kubernetes workspace in Coder v2] ( ./docs/screenshot.png )
2026
27+ <<<<<<< HEAD
2128##Highlights
2229
2330Workspaces:
@@ -30,15 +37,26 @@ Templates:
3037- Use any OS and architecture: Mac, Windows, Linux, VM, Kubernetes, ARM, etc
3138- Auto-shutdown or update workspaces when they're not in use!
3239
40+ ||||||| parent of b6574d34 (Integrate Ben's improvements)
41+ ##Highlights
42+
43+ - Automate development environments for Linux, Windows, and macOS
44+ - Start writing code with a single command
45+ - Get started quickly using one of the[ examples] ( ./examples ) provided
46+ =======
47+ - Automate development environments for Linux, Windows, and macOS
48+ - Start writing code with a single command
49+ - Get started quickly using one of the[ examples] ( ./examples ) provided
50+ >>>>>>> b6574d34 (Integrate Ben's improvements)
3351
3452TODO: succintly list value props
3553
3654##How it works
3755
38- Coder workspaces are represented withterraform . But, noterraform knowledge is
56+ Coder workspaces are represented withTerraform . But, noTerraform knowledge is
3957required to get started. We have a database of pre-made templates built into
4058the product. Terraform empowers you to create
41- environments on_ anything_ , including:
59+ remote environments on_ anything_ , including:
4260
4361- VMs across any cloud
4462- Kubernetes across any cloud (AKS, EKS, GKS)