Welcome to the Treehouse Community

Want to collaborate on code errors? Have bugs you need feedback on? Looking for an extra set of eyes on your latest project? Get support with fellow developers, designers, and programmers of all backgrounds and skill levels here with the Treehouse Community! While you're at it, check out some resources Treehouse students have shared here.

Looking to learn something new?

Treehouse offers a seven day free trial for new students. Get access to thousands of hours of content and join thousands of Treehouse students and alumni in the community today.

Start your free trial

Ruby

Ossian MacDonald
Ossian MacDonald
2,175 Points
Posted by Ossian MacDonald
Ossian MacDonald
2,175 Points

Conflicts adding to Github

Hi All,

After wrestling with adding front end changes to the treebook project in the "build a simple ruby on rails application" project, I finally got my new code up there. But, there are a bunch of conflicts. Part of the issue getting the code up was dealing with conflicts that the counsel said needed to be merged. I am unsure as to why these conflicts exist, and the role of merging in github 'pushing'. Are there more in-depth resources about github authorship on treehouse? I tried following the instructions exactly, and am unsure why all the difficulty?

Cheers!

3 Answers

Stone Preston
Stone Preston
42,016 Points
Stone Preston
Stone Preston
42,016 Points

well if you followed the steps exactly it should have worked fine. Merging and pushing are not the same thing.

You merge whenever you check out a branch (not the master branch) and work on it then merge it back with the master

after you merge you would push it back up.

So you probably tried pushing your code while not on the master branch, which caused some problems since you first needed to merge your current branch with the master, and then finally push it back up.

James Barnett
James Barnett
39,199 Points
James Barnett
James Barnett
39,199 Points

You might find git - the simple guide helpful

Are there more in-depth resources about github authorship on treehouse?

There isn't a more indepth guide to git on Treehouse (yet) Tommy Morgan is making a course on Git due out this month.

Tommy Morgan
Tommy Morgan
Treehouse Guest Teacher
Tommy Morgan
Tommy Morgan
Treehouse Guest Teacher

There is now!

Git Basics just went live. Thought I'd let you know, Ossian MacDonald :)

Ossian MacDonald
Ossian MacDonald
2,175 Points
Ossian MacDonald
Ossian MacDonald
2,175 Points

Thanks for the tips guys! I've been looking at resources, and all of them say to manually address the conflicts when they occur. But, I must admit that I don't know what a conflict actually is nor how to solve it.

Stone, I don't think I created another branch. I didn't type anything into the counsel to create another branch that I am aware of. I made some changes locally, on the same machine that I initially created the project on. I don't believe that this would require creating another branch? My understanding is that one creates another branch in order to test separate features away from the main project?