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

Make sno status give info about ongoing merge #98

Merged
merged 1 commit into from
Jun 3, 2020
Merged

Make sno status give info about ongoing merge #98

merged 1 commit into from
Jun 3, 2020

Conversation

olsen232
Copy link
Collaborator

@olsen232 olsen232 commented Jun 2, 2020 

$ sno status
On branch ours_branch

Repository is in "merging" state.
Merging branch "theirs_branch" into ours_branch
Conflicts:

nz_pa_points_topo_150k:
  Feature conflicts:
    add/add: 1
    edit/edit: 3


View conflicts with `sno conflicts` and resolve them with `sno resolve`.
Once no conflicts remain, complete this merge with `sno merge --continue`.
Or use `sno merge --abort` to return to the previous state.

Also supports --json output.

@olsen232 olsen232 requested a review from craigds June 2, 2020 23:55
@olsen232 olsen232 merged commit ea7b85b into master Jun 3, 2020
@olsen232 olsen232 deleted the merge_status branch June 3, 2020 01:45
@olsen232 olsen232 mentioned this pull request Jun 3, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@craigds craigds craigds 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.
2 participants
@olsen232 @craigds