-
Notifications
You must be signed in to change notification settings - Fork 302
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
Conversation
There was a problem hiding this 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-by
line 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!
Thanks @spzala was just about to do.. |
Hey @Shubhdeep02 - Please rebase and squash commits, there should only be a single commit for this pull request, thanks. |
Hey @jmhbnz i have rebased the commits please take a look into it. |
Thanks - there are still three commits showing, please squash your commits. |
@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. |
@jmhbnz i have rebased the previous commits into a single commit 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! |
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. |
@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? |
Given the amount of git surgery you've done on this branch already, opening a new, clean PR is the easier path. |
[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 |
Explanation improvement....for the issue #787