4 ms·
This isn't a git flow issue, unless I'm missing something. If anything, you can more easily revert a bad set of changes by simply reverting the merge commit. F
by gonyea 11y ago
This isn't a git flow issue, unless I'm missing something. If anything, you can more easily revert a bad set of changes by simply reverting the merge commit.
Front-end testing is hard, but you need to figure that out. Ruby Motion can come in quite handy for that.
- prats226 11y agoYeah mostly issue is with front end testing. Also we were not keen on using revert so never really tried it. Is this correct way to revert a merge commit? Because it looks pretty complicated to revert merge commit on development and when need to push those changes back, you need to first revert the revert commit and then merge the branch back. https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt https://github.com/git/git/blob/master/Documentation/howto/r...
- gonyea 11y agoIf you're using github, you can also go into the merged PR and hit revert, assuming conflicting changes haven't been made. Otherwise you can do `git revert SHA -m 1` and fix conflicts / commit.