search

cmm-21 / a5

0 stars 0 forks source link

Error in update #13

Open boduan1 opened 3 years ago

boduan1 commented 3 years ago

image I run the two lines inside a5 folder and got this error. What should I do?

eastskykang commented 3 years ago

@boduan1 please read this article: https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts and try to resolve the conflicts.

boduan1 commented 3 years ago

I tried to add. and commit, but what to do then? I tried to push but it doesn't work. image

boduan1 commented 3 years ago

Also tried git rebase --skip And can't do git push and git pull image

eastskykang commented 3 years ago

Let's have a quick zoom chat. Please send me your available time to kangd@ethz.ch

update: please add a comment below this once you send a mail (just to make sure not to miss your mail)

boduan1 commented 3 years ago

Let's have a quick zoom chat. Please send me your available time to kangd@ethz.ch

update: please add a comment below this once you send a mail (just to make sure not to miss your mail)

Thanks a lot for your help!

deltahue commented 3 years ago

Did you find the issue? I seem to have the same problem

eastskykang commented 3 years ago

If you have a merging issue and you didn't manage to resolve it, please back up your code and add a comment here.

I can delete your repository and then you can start from the updated code base.

deltahue commented 3 years ago

Thanks, I found another way by pulling from the cmm/a5 repo, replacing the origin with my repo and then force pushing it