Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

software engineering assignment-GitHub page #3108

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions commands.txt

Choose a reason for hiding this comment

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

esg_deployment_research.pdf

Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@

1. Navigate to the directory:
cd desktop
cd S.Eng

2. Clone the repository:
git clone https://github.com/octocat/Hello-World.git

3. Navigate to the cloned repository:
cd Hello-World

4. List the contents of the directory:
ls

5. View the commit history:
git log --oneline

6. Clone another repository:
git clone https://github.com/kepher99/Hello-World.git

7. Navigate to the new cloned repository:
cd Hello-World

8. Create and switch to a new branch:
git checkout -b feature-update

9. Create a new file and add content:
echo "This is a new feature" > new-feature.txt

10. Add the new file to staging:
git add new-feature.txt

11. Commit the changes:
git commit -m "Add new feature"

12. Switch to the master branch (main branch did not exist):
git checkout master

13. Merge the new branch into master:
git merge feature-update

14. Pull the latest changes from the remote master branch:
git pull origin master

15. Attempt to navigate to a non-existent directory:
cd new-feature

16. Create and switch to another new branch:
git checkout -b resolve-conflict

17. Add and commit changes to resolve conflicts:
git add new-feature.txt
git commit -m "Resolve conflict in new-feature.txt"

18. Switch back to the master branch:
git checkout master

19. Merge the resolve-conflict branch into master:
git merge resolve-conflict

20. Open the project in Visual Studio Code:
code .

21. Commit additional changes:
git commit -m "Add index.html for GitHub Pages"

22. Push the changes to the remote repository:
git push origin master
55 changes: 55 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Hello World</title>
<style>
body {
font-family: Arial, sans-serif;
background-color: #f0f0f0;
color: #333;
margin: 0;
padding: 0;
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
}
.container {
background-color: #fff;
padding: 20px;
border-radius: 10px;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
text-align: center;
}
h1 {
color: #007BFF;
}
p {
font-size: 1.2em;
margin-top: 0;
}
a {
display: inline-block;
margin-top: 20px;
text-decoration: none;
color: #fff;
background-color: #007BFF;
padding: 10px 20px;
border-radius: 5px;
transition: background-color 0.3s;
}
a:hover {
background-color: #0056b3;
}
</style>
</head>
<body>
<div class="container">
<h1>Hello, GitHub Pages!</h1>
<p>Welcome to your first GitHub Pages site. This is a simple example to get you started.</p>
<a href="https://github.com/kepher99/Hello-World">Visit Repository</a>
</div>
</body>
</html>
Binary file added new-feature.txt
Binary file not shown.
24 changes: 24 additions & 0 deletions process.md

Choose a reason for hiding this comment

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

    • @the_business_value_of_chrome_os_business_value_snapshot.pdf

****

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Git, GitHub, and Open Source Exploration

## Cloning and Forking
- Cloned `octocat/Hello-World` repository.
- Forked the repository and cloned the fork.

## Managing Branches
- Created `feature-update` branch and added `new-feature.txt`.
- Merged `feature-update` into `main`.

## Handling Conflicts
- Created a conflict in `new-feature.txt` on GitHub.
- Resolved the conflict on the `resolve-conflict` branch.

## GitHub Pages
- Created `index.html` and enabled GitHub Pages.

## Open Source Exploration
- Explored `some-open-source-project`.
- Opened an issue suggesting an improvement.

Repository URL: [https://github.com/kepher99/Hello-World.git]

Published Page: (https://kepher99.github.io/Hello-World/)