Skip to main content

NOTICE: On Friday Nov 6, Workspaces will be temporarily unavailable for maintenance.

🚀 In our NEW AI Bootcamp you'll build a working app in 28 days, no experience required. Free to all subscription levels.

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

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

  • Treehouse Logo
    • For Individuals
    • For Businesses
    • For Schools
    • For Libraries
    • For Military
    • All Courses
    • Tracks
    • AI Bootcamp
    • College Credit
    • Techdegree Bootcamps
    • Front End Development
    • Full Stack JavaScript
    • Code Adventures
    • Discord
    • Forum
    • Success Stories
    • Treehouse Links
    • 100 Days of Code
    • Explore
    • Career Toolbox
    • Free Treehouse Near Me
    • Affiliates
    • Blog
    • Support
    • About
    • Learn
    • Beginner's Guide to Coding
    • Data Analysis with SQL & Python
    • Front-End Web Development
    • Python Programming Basics
    • Techdegree Bootcamp Overview
    • UX Design Fundamentals
    • AI Tools for Beginners
  • For Individuals For Businesses For Schools For Libraries For Military
  • All Courses Tracks AI Bootcamp College Credit
  • Techdegree Bootcamps Front End Web Development Full Stack JavaScript
  • Code Adventures Discord Forum Success Stories Treehouse Links 100 Days of Code
  • Explore Career Toolbox Free Treehouse Near Me Affiliates Blog Support About
    Learn Beginner's Guide to Coding Data Analysis with SQL & Python Front-End Web Development Python Programming Basics Techdegree Bootcamp Overview UX Design Fundamentals AI Tools for Beginners
  • Sign In
  • Free Trial
Instagram Twitter Facebook YouTube LinkedIn
Loading banner... Start your free trial at Treehouse
    • Newest
      • Newest
      • Active
      • Unanswered
      • Featured
    • All Topics
      • All Topics
      • • General Discussion
      • • AI
      • • 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
      • • Vibe Coding
  • Abdullahi Abdinasir Ali
    Abdullahi Abdinasir Ali
    9,520 Points

    I remove pessimistic branch

    Posted May 1, 2018 6:26am by Abdullahi Abdinasir Ali
    Abdullahi Abdinasir Ali
    9,520 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    1 Answer

  • Abdullahi Abdinasir Ali
    Abdullahi Abdinasir Ali
    9,520 Points

    What resolution should remove and persemetic problem

    Posted April 30, 2018 2:30pm by Abdullahi Abdinasir Ali
    Abdullahi Abdinasir Ali
    9,520 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    1 Answer

  • Abdullahi Abdinasir Ali
    Abdullahi Abdinasir Ali
    9,520 Points

    What do I remove or keep in console

    Posted April 24, 2018 3:53am by Abdullahi Abdinasir Ali
    Abdullahi Abdinasir Ali
    9,520 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    2 Answers

  • Richard Lake
    Richard Lake
    20,462 Points

    Challenge impossible

    Posted March 7, 2018 1:47pm by Richard Lake
    Richard Lake
    20,462 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    1 Answer

  • Nobody Tebulo
    Nobody Tebulo
    13,233 Points

    Resolve the second merge conflict however you'd like. Oops! It looks like Task 1 is no longer passing.

    Posted September 4, 2017 10:55am by Nobody Tebulo
    Nobody Tebulo
    13,233 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    1 Answer

  • Nobody Tebulo
    Nobody Tebulo
    13,233 Points

    Resolve the second merge conflict however you'd like. Oops! It looks like Task 1 is no longer passing.

    Posted September 4, 2017 10:55am by Nobody Tebulo
    Nobody Tebulo
    13,233 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    0 Answers

  • Arvind Kevin Arjun Sharma
    Arvind Kevin Arjun Sharma
    8,272 Points

    Who can help me with the answer for this? i really don't know what to do in this task.

    Posted July 3, 2017 10:52pm by Arvind Kevin Arjun Sharma
    Arvind Kevin Arjun Sharma
    8,272 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    1 Answer

  • John Falato
    John Falato
    1,885 Points

    I'm in "https://teamtreehouse.com/library/conflict-resolution" and the editing function is not working.

    Posted July 16, 2016 7:44pm by John Falato
    John Falato
    1,885 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    2 Answers

  • Thurman Ward
    Thurman Ward
    2,718 Points

    either there's an error in the question ..... or a poorly written question

    Posted June 23, 2016 8:59pm by Thurman Ward
    Thurman Ward
    2,718 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    1 Answer

  • MUZ140884 Maxwell Makumucha
    MUZ140884 Maxwell Makumucha
    6,291 Points

    im stuck, how do we go about step 1. The video is a bit difficult to understand

    Posted November 10, 2015 3:32pm by MUZ140884 Maxwell Makumucha
    MUZ140884 Maxwell Makumucha
    6,291 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    0 Answers

  • Pablo Grippo
    Pablo Grippo
    25,765 Points

    I can't resolve the first merge conflict. Please help me!

    Posted July 22, 2015 7:33pm by Pablo Grippo
    Pablo Grippo
    25,765 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    1 Answer

  • Kudakwashe Chayerera
    Kudakwashe Chayerera
    3,415 Points

    Resolve the first merge conflict by accepting the HEAD version of the conflict.

    Posted July 16, 2015 5:21pm by Kudakwashe Chayerera
    Kudakwashe Chayerera
    3,415 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    1 Answer

  • Darwin Zone
    Darwin Zone
    7,303 Points

    How to resolve the first merge conflict by accepting the HEAD version of the conflict.

    Posted March 26, 2015 6:00pm by Darwin Zone
    Darwin Zone
    7,303 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    1 Answer

  • Jonathan Musso
    Jonathan Musso
    3,760 Points

    Resolve the first merge conflict by accepting the HEAD version of the conflict.

    Posted February 4, 2015 3:19pm by Jonathan Musso
    Jonathan Musso
    3,760 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    0 Answers

  • codebully
    codebully
    2,306 Points

    It's a bit unclear what the author wants here.

    Posted August 3, 2014 2:43am by codebully
    codebully
    2,306 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    1 Answer

  • Ann Boen
    PLUS
    Ann Boen
    Courses Plus Student 18,089 Points

    Git Merging - I don't g(i)t (get) it!

    Posted May 6, 2014 9:32am by Ann Boen
    Ann Boen
    Courses Plus Student 18,089 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    3 Answers

  • bahman sadeghi
    bahman sadeghi
    4,810 Points

    branch conflict

    Posted February 27, 2014 7:57pm by bahman sadeghi
    bahman sadeghi
    4,810 Points
    • Development Tools
    • Git Basics
    • Merging
    • Conflict Resolution

    1 Answer

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

Techdegree

  • Front End Web Development
  • Full Stack JavaScript
SEE ALL

Tracks

  • Learn to Code for Beginners
  • Beginning Python
  • Beginning SQL
  • Beginning Java
SEE ALL

Courses

  • JavaScript Basics
  • Intro to HTML & CSS
  • Python Basics
  • CSS Layout
SEE ALL

About Us

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

Explore

  • Plans
  • Affiliates
  • Perks
  • Shop
  • Free Treehouse Near Me
  • Treehouse for Libraries
  • Treehouse for Businesses

Treehouse is an online technology education platform founded in 2011. Treehouse offers more than 700 self-paced, video-based courses in web development, programming, data analysis, design, and AI, plus two project-based bootcamp programs in Front End Web Development and Full Stack JavaScript. Individual Treehouse plans start at $25 per month and include a 7-day free trial. Treehouse serves individual learners, businesses, schools, and public libraries. Cardholders at participating U.S. public libraries can use Treehouse for free. Select Treehouse courses, offered with University Pathways International, are recommended for college credit by ACE and NCCRS. Treehouse learners earn digital certificates for completed Tracks.

Terms & Conditions · Privacy · © 2026 Treehouse Island, Inc.
  • Twitter
  • YouTube
  • Facebook
  • LinkedIn
  • Instagram
  • Discord