search

OpenNTI / nti.web.profiles

Other
0 stars 0 forks source link

Fix/chat #48

Closed MahmoudMousaHamad closed 3 years ago

jsg2021 commented 3 years ago

We've made some changes to this package around the same files. Please rebase and resolve conflicts.

MahmoudMousaHamad commented 3 years ago

So, it looks like I have committed the same 2 commits. That's not okay. I should have run git rebase --skip but I forgot.

jsg2021 commented 3 years ago

That's not what I had in mind... image

but, I think it will work this time.

MahmoudMousaHamad commented 3 years ago

Yeah, I will be more careful next time around.

jsg2021 commented 3 years ago

switch to master, pull. delete the fix/chat branch locally and start a new branch.