https://github.com/adamceggrid/gd_internship

GIT Basics task
https://github.com/adamceggrid/gd_internship

git github

Last synced: about 1 month ago
JSON representation

GIT Basics task

• Host: GitHub
• URL: https://github.com/adamceggrid/gd_internship
• Owner: AdamCegGrid
• Created: 2024-04-25T10:20:20.000Z (8 months ago)
• Default Branch: main
• Last Pushed: 2024-05-09T11:43:35.000Z (8 months ago)
• Last Synced: 2024-05-10T07:24:58.015Z (8 months ago)
• Topics: git, github
• Language: CSS
• Homepage:
• Size: 146 KB
• Stars: 0
• Watchers: 1
• Forks: 0
• Open Issues: 2
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project

README

        
# GIT Basics task

[![Made by Adam Cegiełka](https://img.shields.io/badge/made%20by%20-Adam%20Cegielka-blue.svg?style=flat-square)](https://adamcegielka.pl) 


[![GitHub](https://img.shields.io/badge/GitHub-Docs-7E5EDB.svg?logo=github)](https://docs.github.com/en)

[![Git](https://img.shields.io/badge/Git-Docs-f14e32.svg?logo=git)](https://git-scm.com/doc)

The repository encompasses introductory GitHub exercises as part of the comprehensive training in software development practices provided by the internship.

## Internship Homework

**Part 1**

1. Create account on https://github.com/ 

2. Install GIT on your workstation https://git-scm.com/book/en/v2/Getting-Started-Installing-Git

3. Setup git: change your global configs (add name and email, setup core text editor).

4. Generate ssh-key and integrate it with GitHub.

5. Create a new `GD_Internship` project on GitHub.

6. Clone project to your workstation.

7. Provide access for a mentor to your repository on GitHub.

**Part 2**

1. Open the git console in the `GD_Internship` directory and do the next steps.

2. Do all your experiments in the folder `task1_git_practice`.

3. Create an empty `readme.txt` file.

4. Make an init commit.

5. Create a develop branch and checkout on it.

6. Create `index.html` empty file. Commit.

7. Create a branch with the name `images`. Checkout. Add some images folder with images inside it. Commit.

8. Change your `index.html`. Add some image source inside it. Commit.

9. Go back to the develop branch.

10. Create a branch with the name `styles`. Add some styles folder with styles source inside it. Commit.

11. Change your `index.html`. Commit.

12. Go to the develop branch.

13. Merge two new branches into develop using git merge command. Resolve conflict if it appears.

14. Do not delete any branches!

15. Merge develop branch into master.

16. Checkout to the develop branch and repeat 7 items once more (use names `images2`, `styles2` for new branches). Now use the git `rebase` command for merging.  

*NOTE: As a result master/develop branches should contains all commits that were done in process*

**Part 3**

1. Try to inspect your repository with the git log command. Use different options with this command `git log --help`.

2. Push all your changes with all your branches to origin `git push origin all`.

3. Execute the command `git reflog` and save its content somewhere (not in the repository) with filename `GIT_Basics_homework.txt`.

[Solution: GIT_Basics_homework](https://drive.google.com/file/d/1D-qrYjU50gk_B3LCrVDugBbWiTq2PfUs/view?usp=sharing)