search

mozilla / bugzy

A bugzilla client for the Activity Stream Team
https://www.bugzy.org
10 stars 13 forks source link

feat: add view for unassigned P1/P2 bugs #239

Closed rjfc closed 1 year ago

rjfc commented 1 year ago

Closes #219.

After some discussion with other members of the team, the view label has been set to "Unassigned P1/P2" although I am open to other ideas.

image
aminomancer commented 1 year ago

Looks great, just one last thing - it needs to be rebased onto master since I merged #232 yesterday. It might merge fine automatically but better to be safe. Thanks!

aminomancer commented 1 year ago

Hmm, you should roll back that commit. You have to rebase onto master, not add new commits. The former updates the parent so the diff contains only your changes. The latter just adds existing changes to yours, which creates conflicts rather than resolving them.

Just git rebase master

Or you can use GitLens, open the Branches subview in the Source Control view, make sure your PR branch is active, then right click the master branch > "Rebase current branch onto branch..." and when it asks if you want rebase or interactive rebase, you choose regular rebase.

aminomancer commented 1 year ago

git revert 8181968

aminomancer commented 1 year ago

Looks like you reverted, but you still need to rebase. I would switch to master, then pull, then switch back to your PR branch, then git rebase master