etcd-io
Improvement of the file how-to-conduct-elections.md
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?
@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
@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!
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.
Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment
