I am a git newbie but have used other SCMs.
I have two branches, master and X. Both have changes, both have been
committed. X has a lot of refactoring changes, master has a few bug fixes I
don't want to lose.
I want to merge X into master. But I'm chicken. What if the merge fails and
leaves me with broken code? There is a deadline coming up and that would be
So I want to know exactly what I have to do merge, *knowing* that I can
easily get to *exactly what I have now*.
What are the steps? Will 'git checkout master; git merge X --no-commit' do
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.