On Mon, 23 Nov 2020 11:01:35 GMT, Michael McMahon <micha...@openjdk.org> wrote:

> What is the effect if this change is integrated as is (from the master 
> branch)? The normal procedure is to merge from a separate branch.

@anupamdev20 note the bot comment above, pushing from your master branch will 
diverge it. You can get around this with the steps described.

> ⚠️ @anupamdev20 a branch with the same name as the source branch for this 
> pull request (`master`) is present in the [target 
> repository](https://github.com/openjdk/jdk). If you eventually integrate this 
> pull request then the branch `master` in your [personal 
> fork](https://github.com/anupamdev20/jdk) will diverge once you sync your 
> personal fork with the upstream repository.
> 
> To avoid this situation, create a new branch for your changes and reset the 
> `master` branch. You can do this by running the following commands in a local 
> repository for your personal fork. _Note_: you do _not_ have to name the new 
> branch `NEW-BRANCH-NAME`.
> 
> ```
> $ git checkout -b NEW-BRANCH-NAME
> $ git branch -f master 537b40e0137614999d07d9678632a24f98057634
> $ git push -f origin master
> ```
> 
> Then proceed to create a new pull request with `NEW-BRANCH-NAME` as the 
> source branch and close this one.

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

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

Reply via email to