https://github.com/abdo-essam/git-version-control-task
This project demonstrates basic Git version control techniques for a simple web project with two HTML files.
https://github.com/abdo-essam/git-version-control-task
Last synced: 4 months ago
JSON representation
This project demonstrates basic Git version control techniques for a simple web project with two HTML files.
- Host: GitHub
- URL: https://github.com/abdo-essam/git-version-control-task
- Owner: abdo-essam
- Created: 2024-12-14T14:31:22.000Z (over 1 year ago)
- Default Branch: main
- Last Pushed: 2024-12-14T14:44:18.000Z (over 1 year ago)
- Last Synced: 2025-06-08T23:36:42.618Z (about 1 year ago)
- Language: HTML
- Homepage:
- Size: 2.93 KB
- Stars: 0
- Watchers: 1
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# Git Version Control Project
## Project Description
This project demonstrates basic Git version control techniques for a simple web project with two HTML files.
### Features
1. **Track Changes**: Multiple commits to track changes in `index.html` and `about.html`.
2. **Branching**: Organized project versions using Git branches.
3. **Conflict Resolution**: Demonstrated resolving a merge conflict.
### Branching Model
- `main`: Production-ready code.
- `development`: Integration and testing.
- `feature-update`: Feature-specific updates.
- `feature-new-feature`: Future feature implementation.
### Merge Conflict
Conflict resolved in `index.html`. Screenshot attached.