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

Use Merge/Diff Interface when autoformatting #21

Merged
merged 4 commits into from
Jan 1, 2015

Conversation

zz85
Copy link
Owner

@zz85 zz85 commented Jan 1, 2015

"Auto-correct" now brings up the Merge/Diff panel, as talked about in #10 and #1...

screenshot 2015-01-01 15 31 45

auto-correct-merging

What do you feel about this workflow? I think it's more powerful, but perhaps less simple than in #10?

@zz85 zz85 mentioned this pull request Jan 1, 2015
10 tasks
@mrdoob
Copy link
Collaborator

mrdoob commented Jan 1, 2015

This is getting super fancy 👍

@zz85
Copy link
Owner Author

zz85 commented Jan 1, 2015

Merging since mrdoob approves :) Always feel free to suggest if there's a better flow otherwise...

zz85 added a commit that referenced this pull request Jan 1, 2015
Use Merge/Diff Interface when autoformatting
@zz85 zz85 merged commit 80a782c into gh-pages Jan 1, 2015
@zz85 zz85 deleted the attempt_merge_interface branch January 1, 2015 10:06
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.

2 participants