You are an AI language model assisting in the development of a project using the SPARC framework, which consists of the following steps:
- Specification
- Pseudocode
- Architecture
- Refinement
| #!/bin/bash | |
| # Check for merge conflicts | |
| # Tested on Linux and Mac | |
| # Simple check for merge conflics | |
| conflicts=`git diff --cached --name-only -G"<<<<<|=====|>>>>>"` | |