Day 𝟮𝟴 of the 𝟭𝟬𝟬 𝗗𝗮𝘆𝘀 𝗼𝗳 𝗗𝗲𝘃𝗢𝗽𝘀 𝗖𝗵𝗮𝗹𝗹𝗲𝗻𝗴𝗲 from KodeKloud

Day 𝟮𝟴 of the 𝟭𝟬𝟬 𝗗𝗮𝘆𝘀 𝗼𝗳 𝗗𝗲𝘃𝗢𝗽𝘀 𝗖𝗵𝗮𝗹𝗹𝗲𝗻𝗴𝗲 from KodeKloud. Today's task was committing a change using Git Cherry Pick.

Here's the scenario. You are working on a branch of a repo. You have been developing and pushing commits, like a good diligent developer should. But a key component needs to pushed to the main branch, but you can't push up and merge your entire branch because it's not ready. What do you do, hotshot?

Answer: Use Git's Cherry Pick feature

With Git's Cherry Pick feature, you can choose a specific commit and push it directly to the main branch.

Before we start, here's the requirement for this task: • One of the developers is working on the 𝗳𝗲𝗮𝘁𝘂𝗿𝗲 branch and their work is still in progress, however they want to merge one of the commits from the feature branch to the main branch, the message for the commit that needs to be merged into main is "𝗨𝗽𝗱𝗮𝘁𝗲 𝗶𝗻𝗳𝗼.𝘁𝘅𝘁". Accomplish this task for them, also remember to push your changes eventually • The repo is cloned at /𝘂𝘀𝗿/𝘀𝗿𝗰/𝗸𝗼𝗱𝗲𝗸𝗹𝗼𝘂𝗱𝗿𝗲𝗽𝗼𝘀

Here were the steps I took to complete this task.

1. CD in the correct directory

2. Find the Commit Hash of the commit you want to copy. I used 𝚐𝚒𝚝 𝚕𝚘𝚐 𝚊nd found the hash starting with 448b: [𝚞𝚜𝚎𝚛@𝚜𝚝𝚜𝚝𝚘𝚛𝟶𝟷 𝚎𝚌𝚘𝚖𝚖𝚎𝚛𝚌𝚎]$ 𝚜𝚞𝚍𝚘 𝚐𝚒𝚝 𝚕𝚘𝚐 𝚌𝚘𝚖𝚖𝚒𝚝 𝟺𝟺𝟾𝚋𝚏𝚋𝚍𝟻𝚍𝚍𝚌𝚏𝟸𝟿𝟸𝟸𝟸𝟽𝟺𝟸𝟹𝟿𝚎𝟹𝟼𝟾𝚋𝟶𝟾𝚍𝟷𝚊𝟼𝟷𝟾𝟿𝟼𝟷𝚏𝟿 𝙰𝚞𝚝𝚑𝚘𝚛: 𝙰𝚍𝚖𝚒𝚗 <𝚊𝚍𝚖𝚒𝚗@𝚔𝚘𝚍𝚎𝚔𝚕𝚘𝚞𝚍.𝚌𝚘𝚖> 𝙳𝚊𝚝𝚎: 𝚃𝚞𝚎 𝙰𝚞𝚐 𝟺 𝟷𝟺:𝟹𝟻:𝟻𝟹 𝟸𝟶𝟸𝟼 +𝟶𝟶𝟶𝟶

   𝚄𝚙𝚍𝚊𝚝𝚎 𝚒𝚗𝚏𝚘.𝚝𝚡𝚝

3. Switch to the Main Branch, 𝚐𝚒𝚝 𝚙𝚞𝚕𝚕, and cherry pick the commit. You have to be in the main branch to 𝚌𝚑𝚎𝚛𝚛𝚢 𝚙𝚒𝚌𝚔 a commit from another branch. The command is 𝚐𝚒𝚝 𝚌𝚑𝚎𝚛𝚢-𝚙𝚒𝚌𝚔 𝚖 𝟷 <𝚑𝚊𝚜𝚑>: [𝚞𝚜𝚎𝚛@𝚜𝚝𝚜𝚝𝚘𝚛𝟶𝟷 𝚎𝚌𝚘𝚖𝚖𝚎𝚛𝚌𝚎]$ 𝚐𝚒𝚝 𝚌𝚑𝚎𝚛𝚛𝚢-𝚙𝚒𝚌𝚔 -𝚖 𝟷 𝟺𝟺𝟾𝚋𝚏𝚋𝚍𝟻𝚍𝚍𝚌𝚏𝟸𝟿𝟸𝟸𝟸𝟽𝟺𝟸𝟹𝟿𝚎𝟹𝟼𝟾𝚋𝟶𝟾𝚍𝟷𝚊𝟼𝟷𝟾𝟿𝟼𝟷𝚏𝟿 [𝚖𝚊𝚒𝚗 𝚍𝚏𝚊𝚏𝟺𝚋𝟸] 𝚄𝚙𝚍𝚊𝚝𝚎 𝚒𝚗𝚏𝚘.𝚝𝚡𝚝 𝙳𝚊𝚝𝚎: 𝚃𝚞𝚎 𝙰𝚞𝚐 𝟺 𝟷𝟺:𝟹𝟻:𝟻𝟹 𝟸𝟶𝟸𝟼 +𝟶𝟶𝟶𝟶 𝟷 𝚏𝚒𝚕𝚎 𝚌𝚑𝚊𝚗𝚐𝚎𝚍, 𝟷 𝚒𝚗𝚜𝚎𝚛𝚝𝚒𝚘𝚗(+), 𝟷 𝚍𝚎𝚕𝚎𝚝𝚒𝚘𝚗(-)

4. Afterwards, 𝚐𝚒𝚝 𝚙𝚞𝚜𝚑 the cherry picked commit: [𝚞𝚜𝚎𝚛@𝚜𝚝𝚜𝚝𝚘𝚛𝟶𝟷 𝚎𝚌𝚘𝚖𝚖𝚎𝚛𝚌𝚎]$ 𝚜𝚞𝚍𝚘 𝚐𝚒𝚝 𝚙𝚞𝚜𝚑 𝙴𝚗𝚞𝚖𝚎𝚛𝚊𝚝𝚒𝚗𝚐 𝚘𝚋𝚓𝚎𝚌𝚝𝚜: 𝟻, 𝚍𝚘𝚗𝚎. 𝙲𝚘𝚖𝚙𝚛𝚎𝚜𝚜𝚒𝚗𝚐 𝚘𝚋𝚓𝚎𝚌𝚝𝚜: 𝟷𝟶𝟶% (𝟸/𝟸), 𝚍𝚘𝚗𝚎. 𝚆𝚛𝚒𝚝𝚒𝚗𝚐 𝚘𝚋𝚓𝚎𝚌𝚝𝚜: 𝟷𝟶𝟶% (𝟹/𝟹), 𝟹𝟷𝟺 𝚋𝚢𝚝𝚎𝚜 | 𝟹𝟷𝟺.𝟶𝟶 𝙺𝚒𝙱/𝚜, 𝚍𝚘𝚗𝚎. 𝚃𝚘𝚝𝚊𝚕 𝟹 (𝚍𝚎𝚕𝚝𝚊 𝟶), 𝚛𝚎𝚞𝚜𝚎𝚍 𝟶 (𝚍𝚎𝚕𝚝𝚊 𝟶), 𝚙𝚊𝚌𝚔-𝚛𝚎𝚞𝚜𝚎𝚍 𝟶 (𝚏𝚛𝚘𝚖 𝟶) 𝚃𝚘 /𝚘𝚙𝚝/𝚎𝚌𝚘𝚖𝚖𝚎𝚛𝚌𝚎.𝚐𝚒𝚝 𝟼𝟺𝟷𝟺𝟸𝟸𝟷..𝚍𝚏𝚊𝚏𝟺𝚋𝟸 𝚖𝚊𝚒𝚗 -> 𝚖𝚊𝚒𝚗

I hope you found this informative! More to come!