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

Development Tools

Posted by brevans26
brevans26
15,198 Points

How can I exchange files between branches?

Accidentaly, I created a second branch without commiting changes to the first one. I commit the changes to the second one but now I want to change those files that were commited to branch two to branch one. Is there a way to do this?

1 Answer

Jennifer Nordell
seal-mask
STAFF
.a{fill-rule:evenodd;}techdegree
Jennifer Nordell
Treehouse Teacher
Jennifer Nordell
.a{fill-rule:evenodd;}techdegree
Jennifer Nordell
Treehouse Teacher

Hi there! My suggestion is to go back to your branch1 with 

git checkout branch1

Then merge the two branches

git merge branch2

This will pull your branch2 into your branch1 and merge them.

Hope this helps! :sparkles:

brevans26
brevans26
15,198 Points

Hehe! I was getting ahead of the videos... This was explained in the following video of the course.

Thanks!