search

ContriHUB / WithYou

A personal safety android app
3 stars 22 forks source link

Fixes issue #1 #39

Closed ShrutisLegion closed 3 years ago

ShrutisLegion commented 3 years ago

Fixed #1

rjankit commented 3 years ago

There are merge conflicts in some files. Resolve them and then raise the PR. One easy way to resolve is pull the current version of the repository and do changes in it whatever you did earlier.

ShrutisLegion commented 3 years ago

There are merge conflicts in some files. Resolve them and then raise the PR. One easy way to resolve is pull the current version of the repository and do changes in it whatever you did earlier.

Sir, in fetching upstream, I'm facing merge conflicts... Can you suggest to me how to tackle this?

rjankit commented 3 years ago

There are merge conflicts in some files. Resolve them and then raise the PR. One easy way to resolve is pull the current version of the repository and do changes in it whatever you did earlier.

Sir, in fetching upstream, I'm facing merge conflicts... Can you suggest to me how to tackle this?

You can fork from the master and do the task you have to do. Then raise the PR.

ShrutisLegion commented 3 years ago

There are merge conflicts in some files. Resolve them and then raise the PR. One easy way to resolve is pull the current version of the repository and do changes in it whatever you did earlier.

Sir, in fetching upstream, I'm facing merge conflicts... Can you suggest to me how to tackle this?

You can fork from the master and do the task you have to do. Then raise the PR.

Sir, The new PR link is https://github.com/ContriHUB/WithYou/pull/45 I requested again for the assessment of the issue on ContriHub, please accept so I would attach this link to that...