From 5786452103ec9534460d81840f8940dc0aa83110 Mon Sep 17 00:00:00 2001 From: RandyC3po Date: Thu, 17 Oct 2024 04:11:02 -0500 Subject: [PATCH 1/2] Create SECURITY.md keep your personal info safe and secure --- SECURITY.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..034e848 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,21 @@ +# Security Policy + +## Supported Versions + +Use this section to tell people about which versions of your project are +currently being supported with security updates. + +| Version | Supported | +| ------- | ------------------ | +| 5.1.x | :white_check_mark: | +| 5.0.x | :x: | +| 4.0.x | :white_check_mark: | +| < 4.0 | :x: | + +## Reporting a Vulnerability + +Use this section to tell people how to report a vulnerability. + +Tell them where to go, how often they can expect to get an update on a +reported vulnerability, what to expect if the vulnerability is accepted or +declined, etc. From ba14e9068509b39ae90ff237c63a928c6beda63a Mon Sep 17 00:00:00 2001 From: RandyC3po Date: Thu, 17 Oct 2024 04:29:51 -0500 Subject: [PATCH 2/2] Update SECURITY.md --- SECURITY.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/SECURITY.md b/SECURITY.md index 034e848..2d1954d 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -19,3 +19,10 @@ Use this section to tell people how to report a vulnerability. Tell them where to go, how often they can expect to get an update on a reported vulnerability, what to expect if the vulnerability is accepted or declined, etc. +git checkout main +git pull origin main +git merge feature-branch +git add . +git commit -m "Resolved merge conflicts" +git push origin main +cd path/to/your/project