Can't make a successful commit

[Konobono]

@crguezl

Good evening profesor, I am having troubles with this repository for a very long time now, I tried already almost everything to fix it, but my commits just won't be successful. I tried to fix every error but whatever I do it never fixes it. I saw that the last succesful commit was actually Yours during the classes during semester. What should I do in this case because I keep losing my progress on this lab? On the other hand I almost finished the nexjs lab, but I also have Error 429 that indicates that the quota is exceeded. I guess I can't fix it without paid OpenAI subscription. Should I just leave it like that?

[crguezl]

Hi @Konobono

When collaborating in git, if your push fails you have to

1. Pull the remote repo in your working space. git pull origin main or similar
2. This may lead to conflicts, if they appear you have to solve them by editing the conflicting files
3. Then commit again
4. then push: now your push will be acceppted

See https://www.simplilearn.com/tutorials/git-tutorial/merge-conflicts-in-git