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

fix the inconsistencies brought up by PR #6 #13

Closed
marktani opened this issue Sep 30, 2016 · 2 comments
Closed

fix the inconsistencies brought up by PR #6 #13

marktani opened this issue Sep 30, 2016 · 2 comments
Assignees
@marktani
Labels
bug

Comments

@marktani
Copy link
Member

marktani commented Sep 30, 2016 •
edited
Loading

see #6 and #7
@marktani marktani self-assigned this Sep 30, 2016
@marktani marktani added the bug label Sep 30, 2016
@marktani
Copy link
Member Author

marktani commented Oct 1, 2016

Ok so I'm having problems in making the branch setup consistent again. Can someone give me a hint here?

pokedex-consistent

The 5 topmost commits in this screenshot are not correctly on the master branch.

@marktani marktani mentioned this issue Oct 1, 2016
Closed
@marktani
Copy link
Member Author

marktani commented Oct 1, 2016 •
edited
Loading

I created a PR in #14. Apparently only two files have a merge conflict, can we assume all the other 255 changed files are correct with this PR? ...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@marktani marktani

Labels
bug
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@schickling @marktani