search

NIAEFEUP / nijobs-fe

[FRONTEND] A platform for companies to advertise their job opportunities to students
GNU General Public License v3.0
23 stars 3 forks source link

Renamed 'Show Filters' button to 'Adjust Filters' and added sticky positioning #188

Closed pedrosilva17 closed 2 years ago

pedrosilva17 commented 2 years ago

Closes #186.

imnotteixeira commented 2 years ago

Try to be more specific when making PRs: which button? which name? which behavior?

PS: after looking at the commit/comments above I managed to find, but I (or anyone else) shouldn't have to look much in order to understand what a PR is about

pedrosilva17 commented 2 years ago

Got it, will fix that tomorrow.

imnotteixeira commented 2 years ago

You'll need to rebase with the updated develop for the build to pass. If you don't know what any of this means, ask someone at the team

pedrosilva17 commented 2 years ago

! [rejected] feature/adjust-filters-button-always-visible -> feature/adjust-filters-button-always-visible (stale info) This happens when I do the last step (git push origin <branch> --force-with-lease. I tried adding --prune on the pull from develop and repeating the process, but the result is the same. What can I do?

Steps followed: git checkout develop git pull origin develop (added --prune here on the second try) git checkout <branch> git rebase develop git push origin <branch> --force-with-lease

imnotteixeira commented 2 years ago

! [rejected] feature/adjust-filters-button-always-visible -> feature/adjust-filters-button-always-visible (stale info) This happens when I do the last step (git push origin <branch> --force-with-lease. I tried adding --prune on the pull from develop and repeating the process, but the result is the same. What can I do?

Steps followed: git checkout develop git pull origin develop (added --prune here on the second try) git checkout <branch> git rebase develop git push origin <branch> --force-with-lease

That indeed is weird. If the rebase succeeded, try running git fetch and retrying the git push --force-with-lease. Or else, you can restart the operation by running git reset --hard origin/feature/adjust-filters-button-always-visible while on the feature/adjust-filters-button-always-visible branch and then re-doing the rebase flow all over again. Maybe there was some problem with the github remote, and the upstream branch was gone for a while (?)

pedrosilva17 commented 2 years ago

! [rejected] feature/adjust-filters-button-always-visible -> feature/adjust-filters-button-always-visible (stale info) This happens when I do the last step (git push origin <branch> --force-with-lease. I tried adding --prune on the pull from develop and repeating the process, but the result is the same. What can I do? Steps followed: git checkout develop git pull origin develop (added --prune here on the second try) git checkout <branch> git rebase develop git push origin <branch> --force-with-lease

That indeed is weird. If the rebase succeeded, try running git fetch and retrying the git push --force-with-lease. Or else, you can restart the operation by running git reset --hard origin/feature/adjust-filters-button-always-visible while on the feature/adjust-filters-button-always-visible branch and then re-doing the rebase flow all over again. Maybe there was some problem with the github remote, and the upstream branch was gone for a while (?)

Using git fetch solved the problem. The tracking of the remote must have had issues somehow. Thanks!

pedrosilva17 commented 2 years ago

Hm, spoke too soon.

pedrosilva17 commented 2 years ago

Oh, I think I know what caused it, I forgot to change the test with the updated name of the button. My bad.

pedrosilva17 commented 2 years ago

Fixed it.