Opencode-Collaborative-20
Opencode-Collaborative-20 copied to clipboard
opencodeiiita
Added navdrawer
171
Fixes #171
Short description of what this resolves:
Added navbar drawer and resolved the conflict from the previous case
Changes proposed in this pull request and/or Screenshots of changes:
Sir I closed the previous PR as I was not able to resolve conflict an made this new one which can be easily merged Here is a live link now https://shuba400.github.io/Opencode-Collaborative-20/
Sir I have resolved the conflicts. Please tell if any other thing is neede to change and I will do it asap
Sir I have made changes in the mobile vies of the site and also added the required buttons on the navdrawer. If any other things are needed I will do it asap
@shuba400 Great work! Please squash the commits and the PR will be ready to merge.
Sir I am not able to understand squash from net. Can you please share a link on squashing commits.
Sir I am not able to understand squash from net. Can you please share a link on squashing commits.
https://github.com/wprig/wprig/wiki/How-to-squash-commits and also resolve conflicts.
Sir I had conflict in the previous case, so what I did was that I closed that PR, deleted the repo and forked the new repo which was up to date and made the necessary changes and made a new PR. It was ready to merge. But now it is again showing conflicts. So is there a efficient way of doing this task
Conflict has been fixed
But squashing is giving some problem
There are no commits showing in my machine for squashing where I need to change pick to squash
@NitinMadhukar
