Git & GitHub Workflow Practice

This repository was created as a hands-on practice space to understand how Git and GitHub workflows are used in real software development.

What I Practiced

Local Git Basics

• Created a local project folder
• Initialized Git repository
• Created and modified files using command line
• Staged multiple changes
• Created commits
• Viewed commit history
• Reset repository to previous commit state
• Used git stash to temporarily shelve work
• Restored stashed changes using git stash pop

Remote Repository Integration

• Created GitHub repository
• Connected local repository with remote origin
• Pushed local commits to GitHub
• Synced local and remote repositories

Branching Workflow

• Created feature branches
• Worked on isolated branch changes
• Modified files across branches
• Committed and pushed branch updates
• Created Pull Requests
• Added follow-up commits to open PRs
• Merged Pull Requests into main branch

Merge Conflict Handling

• Intentionally created merge conflicts
• Reviewed conflicting code
• Resolved conflicts manually
• Completed conflict merge successfully

Rebase Workflow

• Synced remote metadata using git fetch origin
• Switched branches using checkout
• Rebased feature branch onto main branch
• Resolved rebase conflicts manually
• Continued rebase process
• Force pushed rebased history to remote
• Successfully completed clean linear history workflow

Key Concepts Learned

• Version control fundamentals
• Commit lifecycle
• Rollback and recovery
• Branching strategy
• Pull Request workflow
• Merge conflict resolution
• Rebasing
• Force push after history rewrite
• Remote synchronization between local and GitHub repositories

Outcome

This practice helped me build practical understanding of Git and GitHub workflows commonly used in collaborative software development environments.