search

ga-wdi-exercises / project1

[project] GA- Project 1
3 stars 75 forks source link

issue with merging branches #179

Closed ghost closed 9 years ago

ghost commented 9 years ago

I want to confirm my planned steps before I merge a branch to master.

I created Branch_A and have solved a few problems in it. This branch contains the latest progress on the project. Work is committed to that branch.

To merge this back to master, I should first merge master to Branch_A, then merge Branch_A to master. That will ensure master is the latest version of my project, correct?

RobertAKARobin commented 9 years ago

That's correct!

ghost commented 9 years ago

thanks!