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

Sync diff #633

Open
1 task done
Asalle opened this issue Nov 12, 2019 · 2 comments · May be fixed by #657
Open
1 task done

Sync diff #633

Asalle opened this issue Nov 12, 2019 · 2 comments · May be fixed by #657
Labels
Type: feature

Comments

@Asalle
Copy link

Asalle commented Nov 12, 2019

  • I have searched for existing issues that may be the same as or related to mine.

Is it possible to add something like "view merge confilits diff"? I often fix merge conflicts by hand and for that I will have to skim through an entire file. Even the worst diff would be so much more helpful! Thank you for the amazing app btw!

Original.
@Asalle Asalle mentioned this issue Nov 12, 2019
Closed
@NiceFeather
Copy link

It would be better if having a workable design or solution.

@nevenz nevenz removed the New label Nov 14, 2019
@Asalle Asalle linked a pull request Jan 17, 2020 that will close this issue
Open
@Asalle
Copy link
Author

Asalle commented Jan 18, 2020

@NiceFeather see #657

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Type: feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Add first draft of "Show diff"(Help me pls!) Asalle/orgzly-android
3 participants
@Asalle @nevenz @NiceFeather