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

Support git merge --continue #94

Merged
merged 1 commit into from
May 28, 2020
Merged

Support git merge --continue #94

merged 1 commit into from
May 28, 2020

Conversation

olsen232
Copy link
Collaborator

git merge --continue

  • only works when in a state "merging"
  • only works when all conflicts are resolved
  • writes all the merged files plus the resolved conflicts as a new commit, moves branch head to the new commit

@olsen232 olsen232 requested review from rcoup and craigds May 28, 2020 03:03
rcoup
rcoup approved these changes May 28, 2020
View reviewed changes
Copy link
Member

@rcoup rcoup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! ⭐

sno/merge.py Show resolved Hide resolved
sno/merge.py Show resolved Hide resolved
craigds
craigds reviewed May 28, 2020
View reviewed changes
sno/cli_util.py Outdated Show resolved Hide resolved
sno/merge_util.py Show resolved Hide resolved
sno/merge_util.py Outdated Show resolved Hide resolved
sno/merge_util.py Outdated Show resolved Hide resolved
@olsen232 olsen232 merged commit 5540ed9 into master May 28, 2020
@olsen232 olsen232 deleted the merge_continue branch May 28, 2020 23:05
@olsen232 olsen232 mentioned this pull request May 28, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@craigds craigds craigds left review comments

@rcoup rcoup rcoup approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@olsen232 @craigds @rcoup