curriculum/challenges/english/blocks/learn-how-to-request-and-receive-guidance/6625df2bb732da94b03089d1.md
To merge branches in version control systems like Git means combining the changes from one branch into another. For example, merging a feature branch into the main branch means adding the new feature to the main code.
To deal with something means to handle or manage it, especially a problem or challenge. For instance, dealing with a difficult customer means managing the situation with the customer.
Oh, thanks, Maria. I'm having a hard time understanding how to BLANK branches. Have you ever had to BLANK with this?
merge
This word refers to the action of combining changes from different branches.
deal
This word means to handle or manage a situation or problem.
{
"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
}
]
}