Skip to content
Open

Lab1 #34

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions README.md

This file was deleted.

16 changes: 0 additions & 16 deletions index.html

This file was deleted.

81 changes: 0 additions & 81 deletions lab1.md

This file was deleted.

75 changes: 0 additions & 75 deletions lab2.md

This file was deleted.

19 changes: 19 additions & 0 deletions submission1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Lab 1 Submission
## Importance of Signed Commits

Signing commits helps verify the authenticity of the author and ensures that the commit has not been tampered with. It adds an additional layer of security, especially in collaborative environments, by enabling traceability and accountability .

## Merge Strategies in Git

### Standard Merge
Standard merge combines two branches by creating a merge commit. It preserves the history of both branches and is ideal for collaborative environments. It makes it easier to track changes over time, but can clutter the commit history with many commits.

### Squash and Merge
Squash and merge compresses all changes from a feature branch into a single commit. This simplifies the commit history but removes the granularity of individual changes.

### Rebase and Merge
Rebase and merge reapplies commits from a feature branch onto the base branch, creating a linear history. However, it can be risky in collaborative work as it rewrites history, making it harder to collaborate effectively.

### Preferred Strategy: Standard Merge
The standard merge strategy is often preferred because it preserves the full commit history and is better suited for collaboration, minimizing the risk of losing context or rewriting history.