483 View in Grafana not working with smoketest.sh

[jan-law]

Fixes #483, where both the JFR datasource and the fibonacci demos attempted to bind to port 8080. Resolved by setting the fibonacci demos to listen at port 8081.

Question: I tried to update my branch with git pull upstream main and now the PR includes the changes made in commit 43713a3 as part of my PR. How do I fix that?

[andrewazores]

Question: I tried to update my branch with git pull upstream main and now the PR includes the changes made in commit 43713a3 as part of my PR. How do I fix that?

You can do a git reset --soft HEAD^ locally, which will undo your commit and move the changes into the staging area.You can then usegit reset, git add, git checkout, etc. to pare down the patch to just what you intend to include. Then git commit and force-push the new commit.

In the future, doing a git fetch upstream && git rebase -i upstream/main might be preferable to a git pull - doing the straight pull will merge the changes into your branch we see here, making PR review more confusing etc. I believe there is a way to configure git to do rebases when pulling rather than merges, too.

git config --global pull.rebase true - https://spin.atomicobject.com/2020/05/05/git-configurations-default/

[ebaron]

Looks good!