[pre-commit.ci] Fixing issues with pre-commit

Author: pre-commit-ci[bot]

docs/tutorials/building_r.md

@@ -64,8 +64,11 @@ cd $BUILDDIR
 CFLAGS="-g -O0"
 ```
 
-- After running this command, the CFLAGS setting will apply only to the
-current terminal session.
+- These flags modify the configuration defined in the next step,
+so that when R is built, C code will be compiled with debugging
+symbols (`-g`) and compiler optimizations will be disabled
+(`-O0`) so that the structure of the code closely matches the
+original source.
 
 **6) Configure the build**
 

scripts/localscript.sh

@@ -42,10 +42,14 @@ local_script
 
 # Remove the .vscode/settings.json file if it exists so that
 # it does not interfere with the devcontainer.json
+<<<<<<< HEAD
 rm -f "$WORK_DIR/.vscode/settings.json"
 
 # 1. Build the ptrace helper library
 gcc -shared -fPIC -o "$SCRIPTS_DIR/allow_ptrace.so" "$SCRIPTS_DIR/allow_ptrace.c"
 
 # 2. Mark the wrapper executable
 chmod +x "$SCRIPTS_DIR/launch_r.sh"
+=======
+rm -f .vscode/settings.json
+>>>>>>> 964acc0 ([pre-commit.ci] Fixing issues with pre-commit)