-
-
Notifications
You must be signed in to change notification settings - Fork 122
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
⚠ Adding jokes to the API should be easier #13
Comments
That's bound to happen as eventually everyone is adding the new joke at the end(i.e. same line) which produces a conflict. |
@damn-dvlpr sure go ahead. |
I'll open a PR real soon, meanwhile I would want you to go through this discussion here: |
@damn-dvlpr hey, I will look into this discussion asap. |
Having been trying to implement the npm module from the past 2 days, yet haven't been able to find a viable solution. |
It might work, but how do we configure that to auto-resolve the issues in our case? Our conflicts are happening because of Joke indexing being redundant on different PRs, how would this be helpful in our case? Have you tried it on your Fork? |
I was trying it out on a test repo I created, i can't figure out with whom this script is interacting with, whether it resolved on the local clone, or alters the working of git merger driver. |
Exactly my point. Try to think of some other solution if you can. |
Why are you guys using ArrayLike Objects? just use plain arrays less merge conflicts and easier to use and add more jokes Don't use ArrayLike Objects. -> {
"0": {
"q": "Relationship status?",
"a": "I'll leave the relations to the database.",
"form": "qa"
},
"1": {
"q": "How do you get the code for the bank vault?",
"a": "You checkout their branch.",
"form": "qa"
},
} Use Arrays -> [
{
"q": "Relationship status?",
"a": "I'll leave the relations to the database.",
"form": "qa"
},
{
"q": "How do you get the code for the bank vault?",
"a": "You checkout their branch.",
"form": "qa"
},
] |
@anuraghazra at first I just randomly picked the joke from ArrayLike Objects, would change the whole thing to Arrays, then I'd have to change it from a JSON to JS file I think. Thanks for the tip man! |
Cool! Updating soon. |
@ABSphreak Still no update? |
Adding jokes to the
jokes.json
API should be easier,right now, if people are adding jokes to the same joke-index concurrently,
only one PR can be merged, the rest would show a merge conflict,
which is tedious.
The text was updated successfully, but these errors were encountered: