Issue #12228: Changes in the overview section applied #12256

nitishfy · 2022-10-05T13:53:29Z

rnveach · 2022-10-05T15:34:17Z

Please look at CI failure and fix:
https://dev.azure.com/romanivanovjr/romanivanovjr/_build/results?buildId=11497&view=logs&j=69ff11bc-5a77-53a4-545f-8dfc2c866a0e&t=fe4ed25a-cc1d-5fd5-85b9-28f4310f8666

The PR is based on a master that is 26 commit(s) old.
The max allowed is 10.
This PR is too old and should be rebased on origin/master.

romani · 2022-10-05T15:44:13Z

This page explains how to pull latest and rebase https://checkstyle.org/beginning_development.html#Starting_Development

nitishfy · 2022-10-05T15:52:08Z

@romani @rnveach My current branch is already up to date

rnveach · 2022-10-05T16:01:51Z

@NitishKumar06 CI and Github says it is not. Maybe confirm you have forced pushed your branch and all its updates to the server.

https://github.com/NitishKumar06/checkstyle/tree/Nitish/12228

This branch is 1 commit ahead, 27 commits behind checkstyle:master.

romani · 2022-10-05T16:45:41Z

Do single commit in PR.
Follow https://checkstyle.org/beginning_development.html#Starting_Development

nitishfy · 2022-10-06T14:08:13Z

@romani The checks are passing now! Please review and suggest some changes if necessary.

rnveach · 2022-10-06T19:35:39Z

@NitishKumar06 There are 2 commits in this PR. We are looking for there to only be 1, which is only your work. No merge commits.
https://github.com/checkstyle/checkstyle/pull/12256/commits

NitishKumar06 wants to merge 2 commits into checkstyle:master from NitishKumar06:Nitish/12228

See https://checkstyle.org/beginning_development.html#Starting_Development step 5 about squashing, rebasing, and force pushing.

nitishfy · 2022-10-07T15:02:07Z

@rnveach Gitbash is showing only 1 commit when I type the command git log.

rnveach · 2022-10-07T15:36:14Z

I don't know the Git command line to assist. I just know that Github shows there are 2 commits and the 2nd one is a merge commit.

nitishfy · 2022-10-07T15:38:28Z

I generally use git command line to raise PRs or make changes. The merge commit is not visible there. Get Outlook for Android<https://aka.ms/AAb9ysg>

…

________________________________ From: rnveach ***@***.***> Sent: Friday, October 7, 2022 9:06:25 PM To: checkstyle/checkstyle ***@***.***> Cc: Nitish Kumar ***@***.***>; Mention ***@***.***> Subject: Re: [checkstyle/checkstyle] Issue #12228: Changes in the overview section applied (PR #12256) I don't know the Git command line to assist. I just know that Github shows there are 2 commits and the 2nd one is a merge commit. — Reply to this email directly, view it on GitHub<#12256 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AUQQSLUZNPNQG4LTE2I4UY3WCA7PTANCNFSM6AAAAAAQ5TIQIU>. You are receiving this because you were mentioned.Message ID: ***@***.***>

nrmancuso · 2022-10-07T15:40:25Z

Try to hard reset back to 222bb9f and force push

rnveach · 2022-10-07T15:44:32Z

Your display may be cut off, but git log on my local is displaying the merge commit.

> git log
commit b5367f5eb65f3cc85c275c15a481327dfcf2c90e (HEAD, z_NitishKumar06/Nitish/12228)
Merge: 222bb9f57 70bbcd835
Author: Nitish Kumar <justnitish06@gmail.com>
Date:   Wed Oct 5 22:07:13 2022 +0530

    Merge branch 'checkstyle:master' into Nitish/12228

commit 70bbcd835e7d51062abd2801d3329b791854891c (z_Kevin222004/master)
Author: rnveach <rveach02@gmail.com>
Date:   Sun Oct 2 08:20:04 2022 -0400

    Issue #12241: removes package private constructors and pmd association

commit 222bb9f57c11c1d64e736ccb2e77682a0ff483a4
Author: NitishKumar06 <justnitish06@gmail.com>
Date:   Wed Oct 5 19:15:56 2022 +0530

    Issue #12228: Changes in the overview section applied

commit a78224b04c5da7b8c52a2e2eaa018d98b0c811fd
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Oct 4 21:18:41 2022 +0000

    dependency: bump pitest-maven from 1.9.6 to 1.9.7

nitishfy · 2022-10-07T15:53:16Z

@rnveach it's not showing for me. Any suggestions on how to proceed further?

rnveach · 2022-10-07T15:57:04Z

Hard reset to the non-merge commit mentioned in this PR and do a rebase on the latest master. Do not do a merge.

nitishfy · 2022-10-08T08:16:32Z

@rnveach This sounds a little complex! Should i just close this PR and raise a new PR for the same?

romani · 2022-10-08T11:39:18Z

Use same PR, just push with force to existing remote branch.

rnveach · 2022-10-08T12:34:40Z

I recommend trying to learn so it will help in the future. It should be simple commands, but it depends on your familiarity with git.

git checkout 12228
git reset --hard 222bb9f57c11c1d64e736ccb2e77682a0ff483a4
git rebase origin/master

Note: I do not use Git command line often, and the checkout and origin remote will depend on your local setup.

nitishfy · 2022-10-11T08:32:11Z

@romani and @rnveach This PR is ready to be merged now!

rnveach · 2022-10-11T12:49:29Z

@NitishKumar06 It is still not squashed. You have 3 commits now because you did another merge.

nitishfy · 2022-10-11T13:15:40Z

@rnveach git log doesn't show me any type of merge commit which needs to be squashed. Infact I believe, when the checks are passing well, why is there a need to squash the commits?

rnveach · 2022-10-11T14:36:15Z

We are working to add a CI item for this, #12259 , and as we found there is some issue with your local that it isn't showing those commits.

I don't remember all the specifics, but merge commits sometimes messes up the display of GH, and we as a group don't do merge commits. Everything should be rebased on top of master. When we merge PRs, we don't do a merge but another rebase. We prefer a single git history flow.

romani

Items

src/xdocs/config.xml

rnveach · 2022-10-11T18:08:44Z

@NitishKumar06 Looks like you got the commits to squash into 1 and rebased.

nitishfy · 2022-10-11T18:16:38Z

It's squashed now! Get Outlook for Android<https://aka.ms/AAb9ysg>

…

________________________________ From: rnveach ***@***.***> Sent: Tuesday, October 11, 2022 11:38:55 PM To: checkstyle/checkstyle ***@***.***> Cc: Nitish Kumar ***@***.***>; Mention ***@***.***> Subject: Re: [checkstyle/checkstyle] Issue #12228: Changes in the overview section applied (PR #12256) @NitishKumar06<https://github.com/NitishKumar06> Looks like you got the commits to squash into 1 and rebased. — Reply to this email directly, view it on GitHub<#12256 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AUQQSLX4VVIQUB3AIHBMBGTWCWULPANCNFSM6AAAAAAQ5TIQIU>. You are receiving this because you were mentioned.Message ID: ***@***.***>

romani

Ok to merge

romani · 2022-10-11T19:43:09Z

GitHub, generate website

github-actions · 2022-10-11T19:46:30Z

https://checkstyle-diff-reports.s3.us-east-2.amazonaws.com/efbb9c1_2022194533/index.html

src/xdocs/config.xml

rnveach · 2022-10-27T17:18:49Z

GitHub, generate website

github-actions · 2022-10-27T17:22:54Z

https://checkstyle-diff-reports.s3.us-east-2.amazonaws.com/96c2e9f_2022172139/index.html

nrmancuso · 2022-10-28T03:01:42Z

@NitishKumar06 please make CI happy, you need to rebase on latest master and fix spelling errors

rnveach · 2022-10-28T12:48:48Z

2 of my comments are not done also.

nitishfy · 2022-10-28T16:10:02Z

@rnveach The changes are applied now!

nrmancuso · 2022-10-28T17:08:05Z

@rnveach The changes are applied now!

@NitishKumar06 please reply “done” on each item to make it clear

nitishfy · 2022-10-28T17:22:58Z

@nrmancuso This PR is ready to be merged now!

rnveach assigned romani Oct 5, 2022

rnveach requested review from rnveach and romani October 5, 2022 15:34

nrmancuso mentioned this pull request Oct 6, 2022

Create CI task to fail PR if merge commit exists #12259

Closed

romani requested changes Oct 11, 2022

View reviewed changes

src/xdocs/config.xml Outdated Show resolved Hide resolved

nitishfy force-pushed the Nitish/12228 branch from 0f15f43 to efbb9c1 Compare October 11, 2022 15:46

romani approved these changes Oct 11, 2022

View reviewed changes

romani assigned rnveach and unassigned romani Oct 11, 2022

rnveach requested changes Oct 12, 2022

View reviewed changes

src/xdocs/config.xml Outdated Show resolved Hide resolved

src/xdocs/config.xml Outdated Show resolved Hide resolved

src/xdocs/config.xml Show resolved Hide resolved

nitishfy force-pushed the Nitish/12228 branch from efbb9c1 to 96c2e9f Compare October 27, 2022 15:31

Issue checkstyle#12228: Changes in the overview section applied

60756de

nitishfy force-pushed the Nitish/12228 branch from 96c2e9f to 60756de Compare October 28, 2022 16:09

nitishfy requested a review from rnveach October 28, 2022 17:23

rnveach approved these changes Oct 28, 2022

View reviewed changes

rnveach merged commit 3bbdf40 into checkstyle:master Oct 28, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue #12228: Changes in the overview section applied #12256

Issue #12228: Changes in the overview section applied #12256

nitishfy commented Oct 5, 2022

rnveach commented Oct 5, 2022

romani commented Oct 5, 2022

nitishfy commented Oct 5, 2022

rnveach commented Oct 5, 2022 •

edited

romani commented Oct 5, 2022

nitishfy commented Oct 6, 2022

rnveach commented Oct 6, 2022 •

edited

nitishfy commented Oct 7, 2022

rnveach commented Oct 7, 2022

nitishfy commented Oct 7, 2022 via email

nrmancuso commented Oct 7, 2022

rnveach commented Oct 7, 2022

nitishfy commented Oct 7, 2022

rnveach commented Oct 7, 2022

nitishfy commented Oct 8, 2022

romani commented Oct 8, 2022

rnveach commented Oct 8, 2022

nitishfy commented Oct 11, 2022

rnveach commented Oct 11, 2022

nitishfy commented Oct 11, 2022

rnveach commented Oct 11, 2022

romani left a comment

rnveach commented Oct 11, 2022

nitishfy commented Oct 11, 2022 via email

romani left a comment

romani commented Oct 11, 2022

github-actions bot commented Oct 11, 2022

rnveach commented Oct 27, 2022

github-actions bot commented Oct 27, 2022

nrmancuso commented Oct 28, 2022

rnveach commented Oct 28, 2022

nitishfy commented Oct 28, 2022

nrmancuso commented Oct 28, 2022

nitishfy commented Oct 28, 2022

Issue #12228: Changes in the overview section applied #12256

Issue #12228: Changes in the overview section applied #12256

Conversation

nitishfy commented Oct 5, 2022

rnveach commented Oct 5, 2022

romani commented Oct 5, 2022

nitishfy commented Oct 5, 2022

rnveach commented Oct 5, 2022 • edited

romani commented Oct 5, 2022

nitishfy commented Oct 6, 2022

rnveach commented Oct 6, 2022 • edited

nitishfy commented Oct 7, 2022

rnveach commented Oct 7, 2022

nitishfy commented Oct 7, 2022 via email

nrmancuso commented Oct 7, 2022

rnveach commented Oct 7, 2022

nitishfy commented Oct 7, 2022

rnveach commented Oct 7, 2022

nitishfy commented Oct 8, 2022

romani commented Oct 8, 2022

rnveach commented Oct 8, 2022

nitishfy commented Oct 11, 2022

rnveach commented Oct 11, 2022

nitishfy commented Oct 11, 2022

rnveach commented Oct 11, 2022

romani left a comment

Choose a reason for hiding this comment

rnveach commented Oct 11, 2022

nitishfy commented Oct 11, 2022 via email

romani left a comment

Choose a reason for hiding this comment

romani commented Oct 11, 2022

github-actions bot commented Oct 11, 2022

rnveach commented Oct 27, 2022

github-actions bot commented Oct 27, 2022

nrmancuso commented Oct 28, 2022

rnveach commented Oct 28, 2022

nitishfy commented Oct 28, 2022

nrmancuso commented Oct 28, 2022

nitishfy commented Oct 28, 2022

rnveach commented Oct 5, 2022 •

edited

rnveach commented Oct 6, 2022 •

edited