Giter VIP home page Giter VIP logo

sourcery-2022-fe-fall-kaunas's Introduction

sourcery-2022-FE-FALL-KAUNAS

  1. Fork repository ( fork icon in top right corner in github )
  2. Clone/Pull repository fork from your account ( Top right corner code button - use SSH type )
  3. Once cloning is complete, check, that you have a folder with the name sourcery-2022-FE-FALL-KAUNAS in working directory.
  4. Go into that directory. In git bash/terminal you should see the name of the folder and the branch name (main)
  5. Create your branch. Name it like ‘feature/name-surname’
  6. Switch to that branch.
  7. Create a folder with your name like name-surname. ( You can use unix commands or use file explorer to create folders and files ).
  8. Go to that folder. All changes you make will be inside this folder.
  9. Create a helloWorld.txt file with the text ‘Hello World!’
  10. Commit that file with message ‘My first commit’
  11. Push this code to repo
  12. Create a branch from your feature branch called conflict/name-surname
  13. Go to your conflict branch ( conflict/name-surname )
  14. Change helloWorld.txt file contents to ‘Hello World from merge-conflict branch!’
  15. Commit and push your changes
  16. Go back to your feature branch ( feature/name-surname )
  17. Change the contents of helloWorld.txt file to ‘Hello from feature branch!’
  18. Commit and push your changes
  19. Merge merge-conflict brach into your feature branch ( feature/name-surname )
  20. Resolve conflicts with your favourite editor. Your finished helloWorld.txt file contents should be:
    ’Hello from feature branch!
    and
    Hello from merge-conflict branch!
    after successful merge conflict’
  21. Commit and push your resolved merge conflict
  22. You should have your feature branch with the helloWorld.txt file and it’s contents:
    ’Hello from feature branch!
    and
    Hello from merge-conflict branch!
    after successful merge conflict’
  23. Go to repo page and check your commit history to see how it looks visually and that all steps were done successfully.
  24. Create a pull Request to merge your feature branch to master

sourcery-2022-fe-fall-kaunas's People

Contributors

golemas7 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.