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.

Sign up for GitHub

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

Jump to bottom

Resuming flow after merge conflict #10

Open
robamaton opened this issue Feb 12, 2015 · 0 comments
Open

Resuming flow after merge conflict #10

robamaton opened this issue Feb 12, 2015 · 0 comments

Comments

@robamaton
Copy link

If there is a merge conflict when finishing a story, as far as I can tell there is no way to resume the finishing process. Right now I have to do the merge commit, manually push to master, delete the local branch, and delete the remote branch. Not too bad, but just wondering if there is a better way.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@robamaton