Remove some mistake and added some suitable words

[Pranav108]

Added more suitable hindi words

[sara-02]

@Pranav108 Can you please resolve the conflicts on this PR so that we merge it.

[Pranav108]

[>] @Pranav108 Can you please resolve the conflicts on this PR so that we merge it.

I am beginner on git , so i don't know how to how to resolve conflict(Although i tried).
So i created a new PR , please have a look at this new PR
bcf5bdf

[sara-02]

@Pranav108 The link you shared is not valid. Are you sure this is the correct link?

[Pranav108]

@Pranav108 The link you shared is not valid. Are you sure this is the correct link?

As I have already mentioned i have beginner here ,so i tried with so many links but none of them worked here(although they worked perfectly when i paste those links in browser)
I think this should work
bcf5bdf
https://github.com/Pranav108/first-contributions/pull/1
Sorry for your inconvenience

[sara-02]

Hey, while the new link works, it does not point to a PR.
In github the PR links are simple of the format <github.com>/<project name>/<pull>/<pull request number>.
This number is what you see that the top after the name of the PR in the form #number, in the link you only provide the number and not link.
Another easy way to refer to a PR in the comments or issues is to simply use the #number link #31656 will give you options to link this PR to itself.

[sara-02]

In case the conflicts are an issue what you do instead is to got your project, update the master of your project w.r.t. the master of the main project using the rebase command. then create a new branch and add your changes in tha that branch and push it/create a new PR.
If you create a commit on the same branch then the commit will be added to the old PR(as long as the PR is not merged)

[sara-02]

As for resolving conflicts,
On your local folder, go to the branch from which this PR was created and perform a rebasing there, it will tell you which files have conflicts and then you keep the changes you want and remove the ones that you do not want.
You then commit and push the code again from the same branch, the PR will be automatically updated and the conflict removed as well.

[sara-02]

https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git

[Roshanjossey]

@sara-02, I've resolved the merge conflicts. Could you please do a review?