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

git merge hooks: automatically resolve conflicts and render markers as separate cells #704

Merged
merged 6 commits into from Aug 1, 2022
Merged

git merge hooks: automatically resolve conflicts and render markers as separate cells #704

merged 6 commits into from Aug 1, 2022

Conversation

seeM
Copy link
Member

@seeM seeM commented Aug 1, 2022

@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

@jph00 jph00 merged commit a5d0549 into fastai:master Aug 1, 2022
@jph00 jph00 added the enhancement New feature or request label Aug 1, 2022
@seeM seeM deleted the git-hooks branch August 1, 2022 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@seeM @jph00