search

rohandebsarkar / academic-folio

WIP: Hugo port of the popular Jekyll theme al-folio
https://academic-folio.netlify.app/
MIT License
17 stars 8 forks source link

Add Menu to TopNav #3

Closed pourmand1376 closed 1 year ago

pourmand1376 commented 1 year ago

I added a dynamic menubar. It is working good.

Code taken from here.

pourmand1376 commented 1 year ago

I think it is better if you could enable squash-and-merge option as we would have cleaner history.

rohandebsarkar commented 1 year ago

I think it is better if you could enable squash-and-merge option as we would have cleaner history.

I will turn it on if you say so. While it is better to squash small PRs, it might be better not to squash big PRs introducing multiple changes and retain it's commit history in case we have to revert commits later on.

pourmand1376 commented 1 year ago

I think it is better if you could enable squash-and-merge option as we would have cleaner history.

I will turn it on if you say so. While it is better to squash small PRs, it might be better not to squash big PRs introducing multiple changes and retain it's commit history in case we have to revert commits later on.

I totally agree. Only small PRs need squash merge.

pourmand1376 commented 1 year ago

Do you think I should submit a PR or instead commit to the main branch regularly?

I see that I had to resolve conflicts twice in the last 30 minutes. This is because PRs are slow by nature.

rohandebsarkar commented 1 year ago

Do you think I should submit a PR or instead commit to the main branch regularly?

I see that I had to resolve conflicts twice in the last 30 minutes. This is because PRs are slow by nature.

I was hoping that it would be better to include changes through PRs. I was also going to block myself from pushing directly. While yes the PRs are a bit slow but it gives other people time to review PRs. I was thinking of a system where we make changes in PRs and wait for another person to have a look at it and give suggestion after that we merge the PR.

Let me know your opinion on this.

pourmand1376 commented 1 year ago

@rohandebsarkar, OK. Let's use the PR way if that's what you want.

But we both have to use the PR way. Otherwise, we would be doing conflict merges all the time.

rohandebsarkar commented 1 year ago

@rohandebsarkar, OK. Let's use the PR way if that's what you want.

But we both have to use the PR way. Otherwise, we would be doing conflict merges all the time.

Yes! I have blocked myself from pushing directly.