Consider the following scenario. I've been working in the master and a release branch. I don't want the changes I've made in the branch to be propagated to the master. For instance, maybe the changes consititute a quick workaround of a problem I expect to fix more robustly in the master. So what I'd normally do is:
git checkout master git merge release_branch git revert -m 1 HEAD However, suppose the merge causes conflicts. It seems dumb to have to resolve the conflicts just so I can revert the commit. Is there a way I can tell the master to ignore the changes that would have been merged, without having first gone through the trouble of carrying out a successful merge, then reverting it? Thanks, -P. --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/github?hl=en -~----------~----~----~----~------~----~------~--~---
