🤑 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

  • 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
  • Carlos Vieira
    PLUS
    Carlos Vieira
    Courses Plus Student 1,345 Points

    How can we resolve a merge conflict if file is not a text or code?

    Posted August 4, 2017 1:25am by Carlos Vieira
    Carlos Vieira
    Courses Plus Student 1,345 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    1 Answer

  • Thomas Katalenas
    Thomas Katalenas
    11,033 Points

    I couldn't find .git/MERGE_HEAD

    Posted August 11, 2016 9:10pm by Thomas Katalenas
    Thomas Katalenas
    11,033 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    0 Answers

  • joeboo2529
    joeboo2529
    9,805 Points

    Github “fatal: remote origin already exists”

    Posted February 16, 2016 9:44am by joeboo2529
    joeboo2529
    9,805 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    0 Answers

  • Kelcey Wilson
    Kelcey Wilson
    15,738 Points

    Getting error: merge: README - not something we can merge

    Posted December 23, 2015 2:32am by Kelcey Wilson
    Kelcey Wilson
    15,738 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    2 Answers

  • Rachelle Wood
    Rachelle Wood
    15,362 Points

    Conflict Merging with Text Files in Windows Version of Git

    Posted September 27, 2015 3:33pm by Rachelle Wood
    Rachelle Wood
    15,362 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    0 Answers

  • rajbee
    rajbee
    6,657 Points

    Resolving merge conflicts without editing files

    Posted September 25, 2015 9:31pm by rajbee
    rajbee
    6,657 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    1 Answer

  • JUSANG YOU
    JUSANG YOU
    7,857 Points

    Difference between git add and git commit.

    Posted May 30, 2015 4:05am by JUSANG YOU
    JUSANG YOU
    7,857 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    2 Answers

  • Mathew Kurian
    Mathew Kurian
    4,698 Points

    How come you can't autocomplete branch names with the TAB button?

    Posted May 18, 2015 2:19am by Mathew Kurian
    Mathew Kurian
    4,698 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    1 Answer

  • Robert Mews
    Robert Mews
    11,540 Points

    Confirming Merge was Succesful

    Posted April 17, 2015 5:33pm by Robert Mews
    Robert Mews
    11,540 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    2 Answers

  • Max Pedersen
    Max Pedersen
    7,196 Points

    Can you combine flags using Git?

    Posted March 22, 2015 7:27pm by Max Pedersen
    Max Pedersen
    7,196 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    1 Answer

  • sakatagintoki
    sakatagintoki
    12,624 Points

    Could not get Master branch and foo-feature branch to auto-merge in previous video. Now serious problems. D:

    Posted January 13, 2015 12:33pm by sakatagintoki
    sakatagintoki
    12,624 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    1 Answer

  • liciabailey
    seal-mask
    .a{fill-rule:evenodd;}techdegree
    liciabailey
    Full Stack JavaScript Techdegree Student 4,353 Points

    Commit Message after a conflict. How to commit when using VIM.

    Posted July 17, 2014 11:12pm by liciabailey
    .a{fill-rule:evenodd;}techdegree
    liciabailey
    Full Stack JavaScript Techdegree Student 4,353 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    4 Answers

  • Chaim Yunger
    Chaim Yunger
    314 Points

    resources on rebasing

    Posted May 6, 2014 3:57pm by Chaim Yunger
    Chaim Yunger
    314 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    1 Answer

  • Dan Szeezil
    Dan Szeezil
    2,823 Points

    Different merge conflict response

    Posted March 6, 2014 4:08pm by Dan Szeezil
    Dan Szeezil
    2,823 Points
    • Development Tools
    • Git Basics
    • Merging
    • Merge Conflicts

    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.