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

Join our Live Career-Building Workshop: Fast-Track Your Tech Career Without a Degree! ⭐ 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
  • okilydokily
    okilydokily
    12,105 Points

    What is a merge conflict? I know you've been talking about this but I still don't understand how separate commits can ..

    Posted November 8, 2018 5:27am by okilydokily
    okilydokily
    12,105 Points
    • Development Tools
    • Git Basics
    • Merging
    • Basic Merging

    1 Answer

  • Andrew Izquierdo
    Andrew Izquierdo
    3,212 Points

    After you merge a branch onto the master branch, do you ever want to continue working with that branch?

    Posted July 18, 2018 12:12am by Andrew Izquierdo
    Andrew Izquierdo
    3,212 Points
    • Development Tools
    • Git Basics
    • Merging
    • Basic Merging

    1 Answer

  • Simon Coates
    Simon Coates
    28,694 Points

    git automerge sounds deeply fraught

    Posted April 5, 2017 9:52am by Simon Coates
    Simon Coates
    28,694 Points
    • Development Tools
    • Git Basics
    • Merging
    • Basic Merging

    2 Answers

  • Seth Warner
    Seth Warner
    5,348 Points

    At the end of the video "Basic Merging" with Tommy Morgan, git had to resolve an issue, can someone..

    Posted February 7, 2016 7:56pm by Seth Warner
    Seth Warner
    5,348 Points
    • Development Tools
    • Git Basics
    • Merging
    • Basic Merging

    0 Answers

  • Adam Helzer
    Adam Helzer
    1,279 Points

    I missed something in the Basic Merging tutorial.

    Posted September 11, 2015 3:39pm by Adam Helzer
    Adam Helzer
    1,279 Points
    • Development Tools
    • Git Basics
    • Merging
    • Basic Merging

    1 Answer

  • gregory gordon
    seal-mask
    .a{fill-rule:evenodd;}techdegree
    gregory gordon
    Full Stack JavaScript Techdegree Student 14,652 Points

    fatal: Not a git repository (or any of the parent directories): .git happened when i started the launch console.

    Posted July 5, 2015 2:08am by gregory gordon
    .a{fill-rule:evenodd;}techdegree
    gregory gordon
    Full Stack JavaScript Techdegree Student 14,652 Points
    • Development Tools
    • Git Basics
    • Merging
    • Basic Merging

    2 Answers

  • Jim Withington
    Jim Withington
    12,025 Points

    Git auto-merge didn't happen in the console

    Posted October 24, 2014 1:39am by Jim Withington
    Jim Withington
    12,025 Points
    • Development Tools
    • Git Basics
    • Merging
    • Basic Merging

    5 Answers

  • Paul Neumyer
    Paul Neumyer
    15,301 Points

    When merging my commits on different branches in Termin I had to follow these instructions

    Posted August 11, 2014 7:17pm by Paul Neumyer
    Paul Neumyer
    15,301 Points
    • Development Tools
    • Git Basics
    • Merging
    • Basic Merging

    0 Answers

  • Christopher Borchert
    Christopher Borchert
    14,814 Points

    Automerge failed? Git is not using the recursive algorithm.

    Posted July 27, 2014 4:01am by Christopher Borchert
    Christopher Borchert
    14,814 Points
    • Development Tools
    • Git Basics
    • Merging
    • Basic Merging

    4 Answers

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.