38. Git and GitHub Project - Task 3

1cd portfolio-project
2
3# Update the main heading
4# Edit index.html to improve the design

1<section id="skills">
2    <h2>My Skills</h2>
3    <ul>
4        <li>HTML5 & CSS3</li>
5        <li>JavaScript</li>
6        <li>Git & GitHub</li>
7        <li>Responsive Design</li>
8    </ul>
9</section>

1#skills {
2    padding: 2rem;
3    background: #f9f9f9;
4}
5
6#skills ul {
7    list-style: none;
8    display: flex;
9    flex-wrap: wrap;
10    gap: 1rem;
11}
12
13#skills li {
14    background: #333;
15    color: white;
16    padding: 0.5rem 1rem;
17    border-radius: 4px;
18}

1# Stage changes
2git add index.html css/style.css
3
4# Commit
5git commit -m "Add skills section with styling"
6
7# Push
8git push origin main

1# My Portfolio Project
2
3A personal portfolio website showcasing my skills and projects.
4
5## Features
6- Responsive design
7- Clean code structure
8- Skills showcase
9- Contact information
10
11## Technologies
12- HTML5
13- CSS3
14- JavaScript
15- Git
16
17## Getting Started
181. Clone this repository
192. Open index.html in your browser
20
21## Author
22Your Name
23
24## License
25MIT

1# Fetch first to see what's new
2git fetch origin
3
4# Check what's new
5git log HEAD..origin/main --oneline
6
7# Pull the changes
8git pull origin main
9
10# Verify
11cat README.md

1# Create and switch to feature branch
2git checkout -b feature/footer
3
4# Add footer to index.html
5cat >> index.html << 'EOF'
6    <footer>
7        <p>&copy; 2024 My Portfolio. All rights reserved.</p>
8        <nav>
9            <a href="https://github.com/username">GitHub</a>
10            <a href="https://linkedin.com/in/username">LinkedIn</a>
11        </nav>
12    </footer>
13EOF
14
15# Add footer styles
16cat >> css/style.css << 'EOF'
17
18footer {
19    background: #333;
20    color: white;
21    padding: 2rem;
22    text-align: center;
23    margin-top: 2rem;
24}
25
26footer a {
27    color: #4CAF50;
28    margin: 0 1rem;
29}
30EOF
31
32# Commit
33git add .
34git commit -m "Add footer with social links"
35
36# Push feature branch
37git push -u origin feature/footer

1// Main JavaScript file
2console.log('Portfolio loaded!');
3
4// Smooth scrolling for navigation
5document.querySelectorAll('a[href^="#"]').forEach(anchor => {
6    anchor.addEventListener('click', function (e) {
7        e.preventDefault();
8        document.querySelector(this.getAttribute('href')).scrollIntoView({
9            behavior: 'smooth'
10        });
11    });
12});

1# Fetch latest
2git fetch origin
3
4# Update your local main
5git checkout main
6git pull origin main
7
8# Go back to feature branch
9git checkout feature/footer
10
11# Merge main into feature
12git merge main
13
14# Or rebase (cleaner history)
15# git rebase main
16
17# Push updated feature branch
18git push origin feature/footer

1# Switch to main
2git checkout main
3
4# Merge feature
5git merge feature/footer
6
7# Push main
8git push origin main
9
10# Delete feature branch
11git branch -d feature/footer
12git push origin --delete feature/footer

1# Pull first
2git pull origin main
3
4# Then push
5git push origin main

1# After git pull or git merge
2# Edit conflicting files
3# Remove conflict markers
4
5git add .
6git commit -m "Resolve merge conflicts"

1# See all recent activity
2git log --oneline --all --graph -10