Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I committed and pushed a merge that shouldn't have happened #213

Merged
merged 1 commit into from Jul 17, 2018
Merged

I committed and pushed a merge that shouldn't have happened #213

merged 1 commit into from Jul 17, 2018

Conversation

ghost
Copy link

@ghost ghost commented Jul 15, 2018

Say you're working with the feature branch model, so any feature you're working on needs to be merged from your branch to the main development branch. It might happen that you or someone else accidentally merges that branch before it was ready to be merged, so here is a lifesaver tip to undo the merge.

@RichardLitt
Copy link
Collaborator

Yes yes yes. So needed. Thanks!

@RichardLitt RichardLitt merged commit c2ffba9 into k88hudson:master Jul 17, 2018
aroup pushed a commit to aroup/git-flight-rules that referenced this pull request Jan 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant