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

fix(cli): fix mergetool committing more than .gitattributes #3013

Merged
merged 5 commits into from Jul 14, 2022

Conversation

Panaetius
Copy link
Member

@Panaetius Panaetius commented Jul 11, 2022

renku mergetool install did not have commit_only set and this restricts it to only commit .gitattributes

closes #3003

@Panaetius Panaetius force-pushed the bugfix/fix-mergetool-commit-paths branch from 7eae922 to 0a517be Compare July 12, 2022 07:39
Copy link
Contributor

@m-alisafaee m-alisafaee left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@Panaetius Panaetius enabled auto-merge (squash) July 13, 2022 15:36
@Panaetius Panaetius merged commit 3905d78 into develop Jul 14, 2022
@Panaetius Panaetius deleted the bugfix/fix-mergetool-commit-paths branch July 14, 2022 06:33
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.

Renku CLI crashes after generating new dataset files.
2 participants