feat: Fix merge conflicts.
This commit is contained in:
13
README.md
13
README.md
@@ -18,9 +18,12 @@ brew tap michael/formula https://git.housh.dev/michael/homebrew-formula
|
|||||||
brew install michael/formula/hpa
|
brew install michael/formula/hpa
|
||||||
```
|
```
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
Installation on platforms other than `macOS` are currently being worked on, along with support for
|
Installation on platforms other than `macOS` are currently being worked on, along with support for
|
||||||
running in a `docker` container.
|
running in a `docker` container.
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 2944a12 (feat: Adds readme and license files)
|
||||||
### Ensuring dependencies are installed.
|
### Ensuring dependencies are installed.
|
||||||
|
|
||||||
This application requires some dependencies to be installed on your system, you can install the
|
This application requires some dependencies to be installed on your system, you can install the
|
||||||
@@ -41,9 +44,12 @@ It will also download an ansible-playbook that is used to generate output files,
|
|||||||
repositories, and encrypt / decrypt variable files. The playbook get's installed to
|
repositories, and encrypt / decrypt variable files. The playbook get's installed to
|
||||||
`~/.local/share/hpa/playbook`.
|
`~/.local/share/hpa/playbook`.
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
> NOTE: All commands accept a `--help` option which will display the arguments and options a command
|
> NOTE: All commands accept a `--help` option which will display the arguments and options a command
|
||||||
> can use, along with example usage of the commands.
|
> can use, along with example usage of the commands.
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 2944a12 (feat: Adds readme and license files)
|
||||||
### Configure the application.
|
### Configure the application.
|
||||||
|
|
||||||
When you first download the application you can setup the configuration file for your use case.
|
When you first download the application you can setup the configuration file for your use case.
|
||||||
@@ -96,7 +102,11 @@ hpa create --template-dir ~/projects/my-template ~/consults/my-first-consult
|
|||||||
Or if your configuration has `directory` set in the `template` section.
|
Or if your configuration has `directory` set in the `template` section.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
<<<<<<< HEAD
|
||||||
hpa create --use-local-template ~/consults/my-first-consult
|
hpa create --use-local-template ~/consults/my-first-consult
|
||||||
|
=======
|
||||||
|
hpa create -l ~/consults/my-first-consult
|
||||||
|
>>>>>>> 2944a12 (feat: Adds readme and license files)
|
||||||
```
|
```
|
||||||
|
|
||||||
## Generating output files.
|
## Generating output files.
|
||||||
@@ -147,6 +157,7 @@ like to generate output for.
|
|||||||
hpa build --project-directory ~/consults/my-first-consult
|
hpa build --project-directory ~/consults/my-first-consult
|
||||||
```
|
```
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
## Some General Usage Notes:
|
## Some General Usage Notes:
|
||||||
|
|
||||||
There is often a lot of output to the console when running commands, which can be problematic if you
|
There is often a lot of output to the console when running commands, which can be problematic if you
|
||||||
@@ -157,6 +168,8 @@ Along the similar line, if you would like to increase the logging output then al
|
|||||||
`-v | --verbose` that will increase the logging output. This can be passed multiple times, so for
|
`-v | --verbose` that will increase the logging output. This can be passed multiple times, so for
|
||||||
the highest log output you can do `-vvv`.
|
the highest log output you can do `-vvv`.
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 2944a12 (feat: Adds readme and license files)
|
||||||
## Uninstalling
|
## Uninstalling
|
||||||
|
|
||||||
You can uninstall the application using:
|
You can uninstall the application using:
|
||||||
|
|||||||
Reference in New Issue
Block a user