Closed bhaveshgoyal182 closed 2 years ago
Hey @bhaveshgoyal182 , would you mind making some changes so I can merge the pull request? Thank you!
Hey @bhaveshgoyal182 , would you mind making some changes so I can merge the pull request? Thank you!
Sure i will be doing this, Pardon me for the late reply 🙂
@madiedgar Can you brief me out once that what I need to do now?
Absolutely @bhaveshgoyal182 👍
Another contributor made changes to some of the same sections of the file you did, so some GitHub doesn't know how to handle the overlap.
You can resolve these conflicts using GitHub's web editor or command line if you're comfortable with that. It can sometimes be a little difficult to see what's actually different between the versions.
Another way is to rebase your branch of hindi-translation
to the current version. Then you can add the changes you did in this PR to the newer version.
Does that make sense?
Hey @bhaveshgoyal182 ! 👋
I apologize for the confusing hurdles with all the code conflicts. Some exciting news - Based on feedback, we've updated the way we're reviewing translations. I was a little confused by your latest commit, so I didn't incorporate it into the refactor. However, if you pull the latest version of the hindi-translation
branch you'll see the new format for translations.
Also! 😄 We still need more Python reviews (for keywords and builtin functions). Would really appreciate it if you would review those translations so we can make Hindi one of the first official Legesher translations! 🎉 I'm going to close this issue, but I'm happy to accept your Python review in another PR! 👍
Fixed/Modified/Suggested some changes in Python words translation to Hindi.
In reference to :- https://github.com/legesher/legesher-translations/pull/222#issuecomment-933686058