scorelab / LabelLab

An Image Analysis and Classification Platform for Machine Learning Researchers
Apache License 2.0
78 stars 112 forks source link

backend:Implement Listing Issues Endpoints (LabelLab 13) #642

Closed M-A-D-A-R-A closed 2 years ago

M-A-D-A-R-A commented 2 years ago

Description

Implement Listing Issues Endpoints

Type of change

URL and Responses:-

Checklist:

amlannandy commented 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.

M-A-D-A-R-A commented 2 years ago

Yeah Sure

amlannandy commented 2 years ago

Yeah Sure

There are still some conflicts. Did you sync your branch with upstream ?

M-A-D-A-R-A commented 2 years ago

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?

amlannandy commented 2 years ago

@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.

amlannandy commented 2 years ago

Try out this from your current branch.

git fetch upstream

git rebase upstream/master

Then push the changes. Force push if necessary.

M-A-D-A-R-A commented 2 years ago

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.

amlannandy commented 2 years ago

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.