a feature
When I'm done I merge that branch into master
Oopsie happens and service is not working in production
In GitLab I press a button Revert that creates a new merge-request that, well, reverts my previous merge-request, basically resetiing master to the state before my feature was merged
Then I go back to my IDE
Update and merge master into my dev branch
Revert the merge which reverted the merge of my feature, so I can continue working on a feature
Is that bad or wrong?
You merge the revert from master into dev and then work on the feature from scratch again?
And then I revert the revert
I'd just push a hotfix instead of reverting
and align production and development
Your dev should be a valid enough test env that nothing gets into production unless it works
Обсуждают сегодня