Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvement of the file how-to-conduct-elections.md #867

Closed
wants to merge 0 commits into from

Conversation

Shubhdeep02
Copy link

@Shubhdeep02 Shubhdeep02 commented Jun 24, 2024

Explanation improvement....for the issue #787

Copy link
Member

@spzala spzala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Shubhdeep02 to pass DCO, the Signed-off-byline is not needed in the PR description but you need it in your commit message. Also, please add some details in the PR description about the changes or issue number if there is any issue this PR fixes. Thanks!

@Shubhdeep02
Copy link
Author

Thanks @spzala was just about to do..

@jmhbnz
Copy link
Member

jmhbnz commented Jun 24, 2024

Hey @Shubhdeep02 - Please rebase and squash commits, there should only be a single commit for this pull request, thanks.

@Shubhdeep02
Copy link
Author

Hey @jmhbnz i have rebased the commits please take a look into it.

@jmhbnz
Copy link
Member

jmhbnz commented Jun 25, 2024

Hey @jmhbnz i have rebased the commits please take a look into it.

Thanks - there are still three commits showing, please squash your commits.

@Shubhdeep02
Copy link
Author

@jmhbnz I guess they aren't part of the changed file but some self generated version update file. So should they be squashed?

@jmhbnz
Copy link
Member

jmhbnz commented Jul 22, 2024

@jmhbnz I guess they aren't part of the changed file but some self generated version update file. So should they be squashed?

Hi @Shubhdeep02 - Please rebase to resolve conflicts and ensure only commit is present with only your changes present in the pr diff.

@Shubhdeep02
Copy link
Author

Shubhdeep02 commented Jul 22, 2024

@jmhbnz i have rebased the previous commits into a single commit as you told me you can check it above

@spzala
Copy link
Member

spzala commented Jul 22, 2024

@jmhbnz i have rebased the previous commits into a single commit you as you told me you can check it above

@Shubhdeep02 thank you, the commits are now squashed to a single commits. But, I see the merge conflicts (the build message above related to branch conflict) so can you please rebase as well. Thanks!

@jberkus
Copy link
Contributor

jberkus commented Aug 26, 2024

The merge conflicts are from files that shouldn't have been in the merge to begin with (dependabot and package). @Shubhdeep02 the easiest way to do this is going to be a new PR. Lemme know if you're still available to do this; otherwise I'll try to copy your text to a new PR myself.

@Shubhdeep02
Copy link
Author

@jberkus Sorry for the delay.......was busy in my placement season

So should I raise a new PR with the same commit or is there any other way around?

@jberkus
Copy link
Contributor

jberkus commented Aug 27, 2024

Given the amount of git surgery you've done on this branch already, opening a new, clean PR is the easier path.

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Shubhdeep02

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants