Skip to content

Feature/lab2#999

Open
G-Akleh wants to merge 12 commits into
inno-devops-labs:mainfrom
G-Akleh:feature/lab2
Open

Feature/lab2#999
G-Akleh wants to merge 12 commits into
inno-devops-labs:mainfrom
G-Akleh:feature/lab2

Conversation

@G-Akleh

@G-Akleh G-Akleh commented Jun 9, 2026

Copy link
Copy Markdown

Goal

Solves lab 2 for the DevOps course repository

Changes

  • Tag v0.1.0-lab2-Ghadeer created with -a -s flags (annotated + signed)
  • Pushed to origin successfully
  • Verified with git tag -v showing "Good" signature ✓
  • Simulated upstream moving with an empty commit on main
  • Rebased feature/lab2 onto origin/main (3 commits replayed cleanly, no conflicts)
  • Pushed with --force-with-lease for safety
  • Captured before/after graph showing linear history
  • Documented when to choose rebase (solo branches, before PR) vs merge (shared branches, preserving history)
  • Explained why rebase was correct for this scenario

Testing

  • Verified object model with git cat-file on main
  • Checked recovery WIP commits via git reflog + git reset --hard
  • Verified tag with git tag -v → Good "git" signature; pushed tag to origin
  • Checked rebasing feature/lab2 onto local main after simulated upstream move; pushed with --force-with-lease

Checklist

  • Title is a clear sentence (≤ 70 chars)
  • Commits are signed (git log --show-signature)
  • submissions/labN.md updated

G-Akleh added 12 commits June 9, 2026 22:16
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Signed-off-by: G-Akleh <ghadeer_akleh@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant