From 4dd0b7eec64d7c60e62e6676323e0ff36725bfa0 Mon Sep 17 00:00:00 2001 From: Alsu Khairullina Date: Wed, 4 Sep 2024 14:16:29 +0300 Subject: [PATCH 1/6] Your signed commit message --- submission1.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 submission1.md diff --git a/submission1.md b/submission1.md new file mode 100644 index 0000000..e526ba7 --- /dev/null +++ b/submission1.md @@ -0,0 +1,4 @@ +The benefits of signing commits +1. Signing commits with a keys GPG/SSH/S/MIME allows other people to verify that the commits actually came from you. +2. By using GPG or SSH keys, especially with vigilant mode enabled, you add a layer of protection against intruders. Vigilant mode ensures that all commits from authorized contributors are verified, that allows to save all data and ensure repository security. +3. Signed commits help organizations meet different requirements by providing a clear, verifiable trail of changes. From c8a5aad033b448810e30a35d6b5448bea5788931 Mon Sep 17 00:00:00 2001 From: Alsu Khairullina Date: Wed, 4 Sep 2024 19:43:44 +0300 Subject: [PATCH 2/6] signed commit message --- submission1.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/submission1.md b/submission1.md index e526ba7..4967297 100644 --- a/submission1.md +++ b/submission1.md @@ -1,4 +1,4 @@ -The benefits of signing commits +# The benefits of signing commits 1. Signing commits with a keys GPG/SSH/S/MIME allows other people to verify that the commits actually came from you. 2. By using GPG or SSH keys, especially with vigilant mode enabled, you add a layer of protection against intruders. Vigilant mode ensures that all commits from authorized contributors are verified, that allows to save all data and ensure repository security. -3. Signed commits help organizations meet different requirements by providing a clear, verifiable trail of changes. +3. Signed commits help organizations meet different requirements by providing a clear, verifiable trail of changes. \ No newline at end of file From a428746ca97e8bfaad24e9493ed557d40c4a9a9f Mon Sep 17 00:00:00 2001 From: Alsu Khairullina Date: Wed, 4 Sep 2024 19:50:10 +0300 Subject: [PATCH 3/6] signed commit message --- submission1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submission1.md b/submission1.md index 4967297..ff9255a 100644 --- a/submission1.md +++ b/submission1.md @@ -1,4 +1,4 @@ -# The benefits of signing commits +**The benefits of signing commits 1. Signing commits with a keys GPG/SSH/S/MIME allows other people to verify that the commits actually came from you. 2. By using GPG or SSH keys, especially with vigilant mode enabled, you add a layer of protection against intruders. Vigilant mode ensures that all commits from authorized contributors are verified, that allows to save all data and ensure repository security. 3. Signed commits help organizations meet different requirements by providing a clear, verifiable trail of changes. \ No newline at end of file From 9f81ef4d8717862deed1bab5979686db991f006f Mon Sep 17 00:00:00 2001 From: Alsu Khairullina Date: Wed, 4 Sep 2024 20:00:42 +0300 Subject: [PATCH 4/6] signed commit message --- submission1.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/submission1.md b/submission1.md index ff9255a..d15e25e 100644 --- a/submission1.md +++ b/submission1.md @@ -1,4 +1,4 @@ -**The benefits of signing commits -1. Signing commits with a keys GPG/SSH/S/MIME allows other people to verify that the commits actually came from you. -2. By using GPG or SSH keys, especially with vigilant mode enabled, you add a layer of protection against intruders. Vigilant mode ensures that all commits from authorized contributors are verified, that allows to save all data and ensure repository security. -3. Signed commits help organizations meet different requirements by providing a clear, verifiable trail of changes. \ No newline at end of file +# The benefits of signing commits +1. Signing commits with a keys GPG/SSH/S/MIME allows other people to verify that the commits actually came from you +2. Signed commits help organizations meet different requirements by providing a clear, verifiable trail of changes +3. By using GPG or SSH keys, especially with vigilant mode enabled, you add a layer of protection against intruders. Vigilant mode ensures that all commits from authorized contributors are verified, that allows to save all data and ensure repository security \ No newline at end of file From dda4068f42ae57435a7a67c65a2c9df9a1a33824 Mon Sep 17 00:00:00 2001 From: Alsu Khairullina Date: Wed, 4 Sep 2024 20:07:48 +0300 Subject: [PATCH 5/6] signed commit message --- submission1.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/submission1.md b/submission1.md index d15e25e..48d151a 100644 --- a/submission1.md +++ b/submission1.md @@ -1,4 +1,4 @@ # The benefits of signing commits -1. Signing commits with a keys GPG/SSH/S/MIME allows other people to verify that the commits actually came from you -2. Signed commits help organizations meet different requirements by providing a clear, verifiable trail of changes -3. By using GPG or SSH keys, especially with vigilant mode enabled, you add a layer of protection against intruders. Vigilant mode ensures that all commits from authorized contributors are verified, that allows to save all data and ensure repository security \ No newline at end of file +1. Signing commits with a keys GPG/SSH/S/MIME allows other people to verify that the commits actually came from you. +2. Signed commits help organizations meet different requirements by providing a clear, verifiable trail of changes. +3. By using GPG or SSH keys, especially with vigilant mode enabled, you add a layer of protection against intruders. Vigilant mode ensures that all commits from authorized contributors are verified, that allows to save all data and ensure repository security. \ No newline at end of file From bce0411606986742e3ce4ee2d4737859ff4d36a3 Mon Sep 17 00:00:00 2001 From: Alsu Khairullina Date: Thu, 5 Sep 2024 12:00:05 +0300 Subject: [PATCH 6/6] signed commit message --- submission1.md | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/submission1.md b/submission1.md index 48d151a..6e6c6d0 100644 --- a/submission1.md +++ b/submission1.md @@ -1,4 +1,31 @@ -# The benefits of signing commits -1. Signing commits with a keys GPG/SSH/S/MIME allows other people to verify that the commits actually came from you. -2. Signed commits help organizations meet different requirements by providing a clear, verifiable trail of changes. -3. By using GPG or SSH keys, especially with vigilant mode enabled, you add a layer of protection against intruders. Vigilant mode ensures that all commits from authorized contributors are verified, that allows to save all data and ensure repository security. \ No newline at end of file +# Task 1 +## The benefits of signing commits +- Signing commits with a keys GPG/SSH/S/MIME allows other people to verify that the commits actually came from you. +- Signed commits help organizations meet different requirements by providing a clear, verifiable trail of changes. +- By using GPG or SSH keys, especially with vigilant mode enabled, you add a layer of protection against intruders. Vigilant mode ensures that all commits from authorized contributors are verified, that allows to save all data and ensure repository security. + +# Task 2 +## Comparison of merge strategies +- 1. Standard Merge: used when preserving the full history, maintaining a full commit record, and working in a collaborative environment where different developers need to contribute without rewriting the history. +- Pros: + Maintains the complete history of all branches + Shows a clear timeline of when branches were merged + Best for preserving the context of development over time +- Cons: + It can result in a more cluttered and confusing commit history due to the addition of numerous merge commits + +- 2. Squash and Merge: used for merging feature branches with numerous small commits, resulting in a cleaner main branch history. +- Pros: + Produces a cleaner commit history by reducing multiple small commits into one + Very suitable for feature branches with many small, incremental commits +- Cons: + losing information about when specific changes were originally made and who authored the squashed commits + If you continue working on the head branch of a pull request after squashing and merging, and then create a new pull request between the same branches, commits that you previously squashed and merged will be listed in the new pull request. You may also have conflicts that you have to repeatedly resolve in each successive pull request. +- 3. Rebase and Merge: used to maintain a clean and linear project history, especially in projects with strict commit rules. +- Pros: + Maintains a linear commit history without extra merge commits. + Helps avoid merge conflicts if used correctly. +- Cons: + Contributors must carefully rebase, resolve conflicts, and force-push to avoid overwriting others' work before using the rebase and merge option on GitHub. + Rebase and merge on GitHub bypasses commit signature verification because GitHub cannot sign commits without access to the user's private signing keys. + \ No newline at end of file