From 0ac9124903e4ed421c6cad77c379e63a224f0505 Mon Sep 17 00:00:00 2001 From: Vidar Holen Date: Wed, 30 Dec 2020 19:54:58 -0800 Subject: [PATCH] Created SC2273 (markdown) --- SC2273.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 SC2273.md diff --git a/SC2273.md b/SC2273.md new file mode 100644 index 0000000..fbb7f35 --- /dev/null +++ b/SC2273.md @@ -0,0 +1,36 @@ +## Sequence of ===s found. Merge conflict or intended as a commented border? + +### Problematic code: + +```sh +======= +``` + +### Correct code: + +Either resolve the merge conflict, or use `# =======` for a border + +### Rationale: + +ShellCheck found a series of `=======`s. If this was supposed to be a border or separator, use a comment. + + +However, it could also be left behind from a source control merge conflict: + +```sh +<<<<<<< HEAD +echo "Goodbye World" +======= +echo "Hello World!" +>>>>>>> mybranch +``` + +In this case, make sure the merge conflict is correctly resolved, and all the markers removed. + +### Exceptions: + +None + +### Related resources: + +* Help by adding links to BashFAQ, StackOverflow, man pages, POSIX, etc! \ No newline at end of file