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

Merge commit created by "land" command is wrong #49

Closed
alangpierce opened this issue Oct 18, 2016 · 0 comments
Closed

Merge commit created by "land" command is wrong #49

alangpierce opened this issue Oct 18, 2016 · 0 comments

Comments

@alangpierce
Copy link
Member

It looks like the command isn't properly updating the index and it creates an empty merge commit that ends up just taking the left side for everything.
alangpierce added a commit that referenced this issue Oct 19, 2016
@alangpierce
fix: properly set the working directory when doing a merge
c60d14f 
Closes #49.

Apparently when doing a merge operation, the default behavior is to do a dry run
when updating the working directory, so we need to set the FORCE setting.
@alangpierce alangpierce mentioned this issue Oct 19, 2016
Merged
alangpierce added a commit that referenced this issue Oct 19, 2016
@alangpierce
fix: properly set the working directory when doing a merge (#50)
ca1242e 
Closes #49.

Apparently when doing a merge operation, the default behavior is to do a dry run
when updating the working directory, so we need to set the FORCE setting.
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
@alangpierce