✨ Earn college credits in Cybersecurity, JS, HTML, CSS and Python

🤑 Join the Treehouse affiliate program and earn 25% recurring commission!

New No-Code Track! 🚀start learning today!

🌟 Dreaming of a bright future? 🎓 Ask about the Treehouse Scholarship program! 🚀

✨ Earn college credits in Cybersecurity, JS, HTML, CSS and Python

🤑 Join the Treehouse affiliate program and earn 25% recurring commission!

  • Treehouse Logo
  • Plans
    Chevron
    • For Individuals
    • For Businesses
    • For Schools
    • For Libraries
    • For Military
  • Library
    Chevron
    • All Courses
    • Tracks
    • College Credit
  • Techdegree
    Chevron
    • Overview
    • Front End Development
    • Full Stack JavaScript
    • Data Analysis
    • UX Design
    • Python
  • Community
    Chevron
    • Code Adventures
    • Discord
    • Forum
    • Success Stories
    • Treehouse Links
    • 100 Days of Code
  • Resources
    Chevron
    • Career Toolbox
    • CodeForward
    • Free Treehouse Near Me
    • Jobs
    • Blog
    • Support
    • About
  • For Individuals For Businesses For Schools For Libraries For Military
  • All Courses Tracks College Credit
  • Overview Front End Web Development Full Stack JavaScript Python Development Data Analysis UX Design
  • Code Adventures Discord Forum Success Stories Treehouse Links 100 Days of Code
  • Career Toolbox CodeForward Free Treehouse Near Me Jobs Blog Support About
  • Sign In
  • Free Trial
Instagram Twitter Facebook YouTube LinkedIn
    • Newest
      • Newest
      • Active
      • Unanswered
      • Featured
    • All Topics
      • All Topics
      • • General Discussion
      • • AI
      • • Android
      • • APIs
      • • Coding for Kids
      • • College Credit
      • • Computer Science
      • • CSS
      • • Data Analysis
      • • Databases
      • • Design
      • • Development Tools
      • • Digital Literacy
      • • Game Development
      • • Go Language
      • • HTML
      • • Java
      • • JavaScript
      • • Learning Resources
      • • Machine Learning
      • • No-Code
      • • PHP
      • • Professional Growth
      • • Python
      • • Quality Assurance
      • • React
      • • Ruby
      • • Security
      • • Swift
    • Showing results for:
    • Development Tools
    • Git Branches and Merging
    • Merging
    • Close
  • Eduardo Osorio
    seal-mask
    .a{fill-rule:evenodd;}techdegree seal-36
    Eduardo Osorio
    Full Stack JavaScript Techdegree Graduate 20,847 Points

    Could someone explain the logic behind merging the master branch into the testing branch first?

    Posted on Jan 24, 2021 by Eduardo Osorio
    .a{fill-rule:evenodd;}techdegree seal-36
    Eduardo Osorio
    Full Stack JavaScript Techdegree Graduate 20,847 Points
    • Development Tools
    • Git Branches and Merging
    • Merging
    • Merging Into Topic Branches

    1 Answer

  • Quadria Freeman
    seal-mask
    .a{fill-rule:evenodd;}techdegree seal-36
    Quadria Freeman
    Full Stack JavaScript Techdegree Graduate 15,680 Points

    I need Help Please

    Posted on Oct 8, 2019 by Quadria Freeman
    .a{fill-rule:evenodd;}techdegree seal-36
    Quadria Freeman
    Full Stack JavaScript Techdegree Graduate 15,680 Points
    • Development Tools
    • Git Branches and Merging
    • Merging
    • Merging

    1 Answer

  • Jamie Reardon
    seal-mask
    .a{fill-rule:evenodd;}techdegree seal-36
    Jamie Reardon
    Treehouse Project Reviewer

    git checkout branch before merging?

    Posted on Jun 4, 2019 by Jamie Reardon
    .a{fill-rule:evenodd;}techdegree seal-36
    Jamie Reardon
    Treehouse Project Reviewer
    • Development Tools
    • Git Branches and Merging
    • Merging
    • Merging Into Topic Branches

    1 Answer

  • johnny louifils
    seal-mask
    .a{fill-rule:evenodd;}techdegree seal-36
    johnny louifils
    Full Stack JavaScript Techdegree Graduate 18,926 Points

    i don't really understand this

    Posted on Apr 13, 2019 by johnny louifils
    .a{fill-rule:evenodd;}techdegree seal-36
    johnny louifils
    Full Stack JavaScript Techdegree Graduate 18,926 Points
    • Development Tools
    • Git Branches and Merging
    • Merging
    • Merging

    1 Answer

  • okilydokily
    okilydokily
    12,105 Points

    Your commits do not look like the commits from the previous video. A git merge does

    Posted on Nov 30, 2018 by okilydokily
    okilydokily
    12,105 Points
    • Development Tools
    • Git Branches and Merging
    • Merging
    • Merging Into Topic Branches

    1 Answer

  • okilydokily
    okilydokily
    12,105 Points

    I wish I had know we were branching off of testing. That could have made more clear.

    Posted on Nov 29, 2018 by okilydokily
    okilydokily
    12,105 Points
    • Development Tools
    • Git Branches and Merging
    • Merging
    • Merging Branches

    1 Answer

  • Belma Gaukrodger
    Belma Gaukrodger
    17,826 Points

    How to resolve conflict in a merge conflict?

    Posted on Nov 26, 2018 by Belma Gaukrodger
    Belma Gaukrodger
    17,826 Points
    • Development Tools
    • Git Branches and Merging
    • Merging
    • Merging

    1 Answer

Posting to the forum is only allowed for members with active accounts.
Please sign in or sign up to post.

    Treehouse

  • About
  • Blog
  • Careers
  • Community
  • Stories
  • Shop
  • Contact
  • Gift Card

See Full Catalogue

Techdegree

  • Front End Web Development
  • Full Stack JavaScript
  • Python Development
  • Data Analysis
  • UX Design

Tracks

  • Learn to Code for Beginners
  • Beginning Python
  • Beginning SQL
  • Beginning Java
  • ...see more

Courses

  • JavaScript Basics
  • Intro to HTML & CSS
  • Python Basics
  • CSS Layout
  • ...see more

Explore

  • Plans
  • Affiliates
  • Perks
  • Free Treehouse Near Me
  • Treehouse for Libraries
  • Treehouse for Businesses
  • Twitter
  • YouTube
  • Facebook
  • LinkedIn
  • Instagram
Terms & Conditions | Privacy

© 2025 Treehouse Island, Inc.