Closed M-A-D-A-R-A closed 2 years ago
@M-A-D-A-R-A There are merge conflicts. Sync your fork and local with the organization repo. Then resolve the merge conflicts and push the changes.
Yeah Sure
Yeah Sure
There are still some conflicts. Did you sync your branch with upstream
?
Yeah Sure
There are still some conflicts. Did you sync your branch with
upstream
?
Yeah I did Fetch the upstream, I tried merging master again in this branch there's no merge conflict.
Should I close this PR and make another one?
@M-A-D-A-R-A No that should not be necessary. Can you go through all the files that you've made changes to in this PR and make sure there are no leftover conflicts in any of them? You've synced your fork with the org repo but you perhaps missed resolving the conflict.
Try out this from your current branch.
git fetch upstream
git rebase upstream/master
Then push the changes. Force push if necessary.
Try out this from your current branch.
git fetch upstream
git rebase upstream/master
Then push the changes. Force push if necessary.
I tried these and made the necessary changes to each commit idk why it's saying merge conflicts.
Try out this from your current branch.
git fetch upstream
git rebase upstream/master
Then push the changes. Force push if necessary.I tried these and made the necessary changes to each commit idk why it's saying merge conflicts.
Yeah this is weird. Let me check it out in the evening. Otherwise I'll merge it locally.
Description
Implement Listing Issues Endpoints
Type of change
URL and Responses:-
URL:- BASE_URL +/api/v1/issue/get/<int:project_id>
Example URL:URL:- BASE_URL +/api/v1/issue/get/1
URL:- BASE_URL +/api/v1/issue/<int:project_id>/category/<string:category>
Example URL:URL:- BASE_URL +/api/v1/issue/1/category/images
URL:- BASE_URL +/api/v1/issue/<int:project_id>/team/<int:team_id>
Example URL:URL:- BASE_URL +/api/v1/issue/1/team/1
URL:- BASE_URL +/api/v1/issue/<int:project_id>/entity/<string:entity_type>/<int:entity_id>
Example URL:URL:- BASE_URL +/api/v1/issue/1/entity/label/1
Checklist: