Giter VIP home page Giter VIP logo

git-challenge-part3's Introduction

Git challenge - Part 3

Instructions

In this lesson we have seen what Cherry Picking is and when to use it. Now we will do some exercises to test how this function works in a real repository.

Start by cloning this repository on your local machine and pushing it to a new repository on your github account.

Follow the instructions given below and once you are done, create a PR from feature-a to master. In the comments of this PR add the answers to the questions asked below (for example: "1.c- your answer"). Then copy the URL of this PR into the box provided on the learning platform.

What you need to do

  1. Create a new branch feature-a

    a. Change anything in the index.html and commit. (commit 1)

    b. While you were working on this branch you found a very important bug that needs to be fixed as soon as possible. Create a new commit fixing this bug (just change anything from the index.html) (commit 2).

    c. You should merge this solution into master as soon as possible to resolve the bug, but you're not ready to merge the entire feature-a branch yet, so now you want to merge just (commit 2). Create a cherry pick to do so. What command would you use?

    d. If you haven't already, push both branches.

  2. Notice how your (commit 2) is now in both master and feature-a. This is what we explained in the theory part that using Cherry Pick creates duplicate commits.

git-challenge-part3's People

Contributors

djabif avatar jurrutiadbp 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.