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

Join our Live Career-Building Workshop: Launch Your Tech-Adjacent Career! ⭐ Register here!

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

Curious which AI tools Treehouse developers love? ⚙️ Check them out!

🫡 Treehouse for Military offers discounts to Veterans, service members and their families!

  • Treehouse Logo
  • Plans
    Chevron
    • For Individuals
    • For Businesses
    • For Schools
    • For Libraries
    • For Military
  • Library
    Chevron
    • All Courses
    • Tracks
  • Techdegree
    Chevron
    • Overview
    • Front End Development
    • Full Stack JavaScript
    • Data Analysis
    • UX Design
    • Python
  • Community
    Chevron
    • 100 Days of Code
    • Live Sessions
    • Code Adventures
    • Discord
    • Forum
    • Success Stories
    • Treehouse Links
  • 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
  • Overview Front End Web Development Full Stack JavaScript Python Development Data Analysis UX Design
  • 100 Days of Code Live Sessions Code Adventures Discord Forum Success Stories Treehouse Links
  • 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
      • • 21st Century Skills
      • • AI
      • • Android
      • • APIs
      • • Business
      • • C#
      • • Computer Science
      • • CSS
      • • Data Analysis
      • • Databases
      • • Design
      • • Development Tools
      • • Digital Literacy
      • • Equity, Diversity, and Inclusion (EDI)
      • • Go Language
      • • HTML
      • • Java
      • • JavaScript
      • • Learning Resources
      • • Machine Learning
      • • PHP
      • • Python
      • • Quality Assurance
      • • React
      • • Ruby
      • • Security
  • 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 January 24, 2021 6:29pm 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 October 8, 2019 1:45am 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 June 4, 2019 1:54pm 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 April 13, 2019 9:04pm 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 November 30, 2018 3:20am 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 November 29, 2018 2:04pm 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 November 26, 2018 7:53am 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
  • Perks
  • Free Treehouse Near Me
  • Treehouse for Libraries
  • Treehouse for Businesses
  • Twitter
  • YouTube
  • Facebook
  • LinkedIn
  • Instagram
Terms & Conditions | Privacy

© 2024 Treehouse Island, Inc.