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

README fixes #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

fishcharlie
Copy link

No description provided.

@traversaro
Copy link
Member

Hello @fishcharlie, thanks a lot for the PR! This is outdated, right?

@@ -80,7 +80,7 @@ Allow support for repositories that use `git lfs` (default `false`).
### `ff_only`

Refuse to merge and exit unless the current HEAD is already up to date or the
merge can be resolved as a fast-forward (default `false`).
merge can't be resolved as a fast-forward (default `false`).
Copy link
Author

Choose a reason for hiding this comment

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

I'm pretty sure this change is still valid. Right? Or am I missing something here?

Copy link
Member

Choose a reason for hiding this comment

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

It refuse the merge unless the merge can be resolved as fast forward, the current wording seems correct to me or I am missing something?

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.

None yet

2 participants