Back to Freecodecamp

Task 61

curriculum/challenges/english/blocks/learn-how-to-request-and-receive-guidance/6625df8d71b44495cde83d48.md

latest1.9 KB
Original Source
<!-- (Audio) Tom: Oh, thanks, Maria. I'm having a hard time understanding how to merge branches. Have you ever had to deal with this? -->

--description--

Tom is expressing difficulty with a specific aspect of version control in programming.

--questions--

--text--

What is Tom having a hard time with?

--answers--

Learning to code in a new programming language

--feedback--

Tom's struggle is specific to merging branches, not learning a new language.


Setting up his computer

--feedback--

His difficulty is related to version control, not computer setup.


Understanding how to merge branches in a version control system


Using the internet effectively

--feedback--

Tom's challenge is about version control, not general internet use.

--video-solution--

3

--scene--

json
{
  "setup": {
    "background": "company1-boardroom.png",
    "characters": [
      {
        "character": "Tom",
        "position": {
          "x": 50,
          "y": 15,
          "z": 1.2
        },
        "opacity": 0
      }
    ],
    "audio": {
      "filename": "9.2-3.mp3",
      "startTime": 1,
      "startTimestamp": 4.58,
      "finishTimestamp": 10.18
    }
  },
  "commands": [
    {
      "character": "Tom",
      "opacity": 1,
      "startTime": 0
    },
    {
      "character": "Tom",
      "startTime": 1,
      "finishTime": 3.3,
      "dialogue": {
        "text": "Oh, thanks Maria. I'm having a hard time",
        "align": "center"
      }
    },
    {
      "character": "Tom",
      "startTime": 3.3,
      "finishTime": 4.74,
      "dialogue": {
        "text": "understanding how to merge branches.",
        "align": "center"
      }
    },
    {
      "character": "Tom",
      "startTime": 5.24,
      "finishTime": 6.6,
      "dialogue": {
        "text": "Have you ever had to deal with this?",
        "align": "center"
      }
    },
    {
      "character": "Tom",
      "opacity": 0,
      "startTime": 7.1
    }
  ]
}