Giter Club home page Giter Club logo

git-exercise's Introduction

git-exercise

  1. Add initial README.md
  2. Ini line yang salah

A. Inisialisasi project di local & remote repository

1, Membuat remote repo di github image

  1. Update README.md di remote repo image

  2. git clone [email protected]:nabiilNajm26/git-exercise.git image image

  3. cd git-exercise

  4. git remote -v image

  5. git config –list

image

B. Membuat file baru di branch dan merge branch tersebut ke main

  1. git checkout -b add/file

  2. git branch image

  3. Create 3 files, addition.py, multiplication.py, substraction.py.

  4. git status image

  5. git add .

  6. git status image

  7. git commit -m “feat: Add addition, multiplication, and substraction functions.” image

  8. Check commit graph pada GitLens image

  9. git log image

  10. git checkout main

  11. git log image

  12. git merge add/file image

  13. Check commit graph pada GitLens image

  14. git log image

C. Studi Kasus Merge Conflict

  1. Buat dan commit perubahan secara langsung di remote repo image

  2. git checkout -b edit/readme

  3. git branch image

  4. notepad README.md

  5. Edit README.md menjadi:

  6. git status

  7. git add .

  8. git commit -m “edit: README.md”

  9. git log image

  10. git checkout main

  11. git merge edit/readme

  12. git log image

  13. git pull origin main (terdapat conflict) image image

  14. Solve conflict

  15. git log image

  16. git checkout edit/readme

  17. git push origin edit/readme:edit/readme

  18. Compare & pull request image

  19. Create pull request image

  20. Ressolve conflict image image

git-exercise's People

Contributors

nabiilnajm26 avatar

Watchers

 avatar

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.