Added blocks and scopes section

[mani-chand]

#1464 issue PR

[mani-chand]

Hello @djmitche , I don't why PR is opened like this . I just normally committed the project and opened the PR then this thing happened. Should I close this PR and open another.

[djmitche]

I think it's because you're making a PR from your main branch. That branch now has a bunch of commits from the break/continue patch in it. I think you will need to create a new PR and close this one.

Here's what I'd suggest:

Get the latest changes from the google repository on github:

$ git fetch google

then reset your main branch to match the google main branch:

$ git checkout main
$ git reset --hard google/main

Now, make a "topic branch" for the blocks and scopes work:

$ git branch blocks-and-scopes
$ git checkout blocks-and-scopes
$ git cherry-pick 6399953

I copied that 6399953 from the "Added Blocks and Scopes section." commit in this PR, and it contains the changes you've made for blocks and scopes.

After that, you can use

$ git push

to push the new blocks-and-scopes branch, and you'll see a nice link to click to create a new PR.

In general (so, next time), begin work by updating your local main branch and then making a topic branch

$ git checkout main
$ git pull google main
$ git branch my-next-project
$ git checkout my-next-project