Closed hemanth06912 closed 4 years ago
@hemanth06912 you have merge conflicts.
@hemanth06912 , there are still going to be merge conflicts because there are 20 files in this PR while you only need to commit 3 of them (controller, router and adding the route to api-router). Perhaps it would be easier to close this PR and create a new one, but make sure to checkout develop and do "git pull" before creating a new branch 😊
@hemanth06912 , there are still going to be merge conflicts because there are 20 files in this PR while you only need to commit 3 of them (controller, router and adding the route to api-router). Perhaps it would be easier to close this PR and create a new one, but make sure to checkout develop and do "git pull" before creating a new branch 😊
I don't know how I pushed 20 files, I resolved merge conflicts of two files, staged and commit them before that I had 18 unknown files which I didn't modify appeared in my branch, when I pulled the lastest changes but I discard all that changes and pushed only 2 files which needed to be changed and resolved
Resolves Issue #174