Skip to content

Conversation

@arnavbhandari414
Copy link
Contributor

Task 5: Remove Intermediate Commits using Rebase

Goal:
This Pull Request addresses Task 5, which involved creating a new branch, adding multiple dummy commits, and then cleaning up the commit history by removing specific intermediate commits.

Changes Implemented:

  1. A new branch named Task5 was created from the latest main branch.
  2. Six sequential dummy commits (Commit 1 through Commit 6) were added to dummy5.txt on the Task5 branch.
  3. An interactive rebase (git rebase -i) was performed to remove "Commit 2: Added Line 2" and "Commit 4: Added Line 4" from the branch's history.
  4. Merge conflicts that arose during the rebase process (due to the dropped commits) were manually resolved to ensure the final dummy5.txt contained only the desired lines (Line 1, Line 3, Line 5, Line 6).
  5. The Task5 branch, with its rewritten history, was force-pushed to the remote repository.

This ensures the branch history is clean and meets the requirements of Task 5.

Copy link
Contributor

@real-Sandip-Das real-Sandip-Das left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just delete the dummy text file and your PR will be merged

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.

2 participants