<Swing Dev> RFR: 8231286: HTML font size too large with high-DPI scaling and W3C_LENGTH_UNITS [v4]

[Prasanta Sadhukhan]

On Wed, 3 Feb 2021 09:17:44 GMT, Matthias Perktold <github.com+7334069+mperktold at openjdk.org> wrote:

> 
> 
> > Merging, rather than rebasing, is usually preferred as it doesn't involve force pushing and makes incremental reviews easier. The answer is the same, though: no, it won't cause problems. The bot comment was that you used "master" as the name of your branch for the other PR meaning it would diverge from the upstream openjdk/jdk master branch.
> 
> OK great.
> I'm still unsure about how to do this exactly.
> 
> I wanted to first merge changes from openjdk master into my fork master, and then merge changes from my master into this branch. That didn't work:
> 
> ```
> To https://github.com/mperktold/jdk.git
>  ! [remote rejected]         master -> master (refusing to allow a Personal Access Token to create or update workflow `.github/workflows/submit.yml` without `workflow` scope)
> error: failed to push some refs to 'https://github.com/mperktold/jdk.git'
> ```
> 
> Is this the wrong aproach? Should I directly merge from `openjdk:master` to `mperktold:JDK-8231286`?
> Or is there some other problem?
> 
> Sorry for the beginner questions.

Did you try
git checkout <branch_name>
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push
If yes, there might be some issue in Personal Access Token(PAT) generation? I normally use ssh that dont rely on PAT..

-------------

PR: https://git.openjdk.java.net/jdk/pull/2256