Git: Make one branch exactly like another

Question

I am relatively new to Git, and I\'m still not very comfortable with it. Right now, I\'m looking for the command/options/magic that can make the current branch look like anothe

Answer 1

Sorry! Didn't read all the way through before answering...

git checkout master
git merge feature

This will work effortlessly if you have not made any changes to master since you branched feature off it.

And what you are trying to do is exactly the way that branching and merging are supposed to work. Develop your features on a branch, when you have it stable and working like you want it to work, merge it back into the master branch.