GeezerVison

This PR has been automatically marked as stale because it has not had activity in the last 30 days. It will be closed if no further activity occurs within 10 days.
Thank you for your contributions.
Community members are welcome to grab these works.

Steve Lee (@SteveL-MSFT), what will it take to get this merged? Another review, or just an act of merging by someone who's authorized?

I fear that the related #8427 and #8430 are about to go stale too.

Thanks, Andrew (@anmenaga).

I've resolved the code-style issues.

Unfortunately, I haven't been able to resolve the merge conflict, and I'm at a loss as to how to do so.
I've copied the changes that have since been added to the master branch to my branch, yet a conflict is still reported (I've later added a small whitespace fix).

Can you help?

Michael Klement (@mklement0) Please remove/reset last commits (merge resolve) - I'm afraid that you could break something. Then you could use "Resolve conflicts" button in GitHub or ping me for help.

# Reset to commit "ooooooo"
git reset --hard ooooooo  
# Remove last commit
git reset --hard HEAD~1

Michael Klement (@mklement0) Did you make a merge commit or just copy the changes across?

If the latter, make sure your master branch is up to date, change to this branch, and then git merge master. Resolve conflicts in your editor and make the final merge commit, then push the changes. That will usually resolve the conflict.

Also note that if you need to reset back from some commits, as Ilya mentions you may want to do, you will need a force-push to remove them from the remote once you're done.

I appreciate your help, Rain Sallow (/u/ta11ow) (@vexx32) and Ilya (@iSazonov).

Indeed I hadn't merged locally and had just tried to copy the changes manually.
(Merging on GitHub wasn't possible.)

I've now merged locally and pushed again, which resolves the conflict.

Do I still need to reset something?
Seems like you could now simply squash-merge.
Ilya (@iSazonov), what could break?

After resolving merge conflicts we have to review again.

Aditya Patwardhan (@adityapatwardhan) The PR is ready to merge.

Thanks, Ilya (@iSazonov).

Just so I get it right in the future, the procedure should be:

• Use GitHub's own merging feature if available (it wasn't in this case).

• Otherwise, merge locally first from an up-to-date master branch, then push, as per Rain Sallow (/u/ta11ow) (@vexx32)'s instructions.

Correct?

Michael Klement (@mklement0) Currently GitHub "resolve merge conflicts" feature works very well and can be used for fast resolving simple conflicts. Large and complex conflicts we have to do locally. I guess there is many ways to do this in git. You can use a way you prefer. Usually I use git pull --rebase PowerShell master then follow git hints.

Michael Klement (@mklement0) Could you answer Ilya (@iSazonov) suggestion?

Aditya Patwardhan (@adityapatwardhan):

Ilya (@iSazonov) was responding how to handle this situation in the future - duly noted by me (and acknowledged with a thumbs-up).

Is there something left to resolve for this PR?
My (superficial) understanding is that the way I've eventually resolved the merge conflict should now allow for squash-merging.

Michael Klement (@mklement0) Thanks for your contribution!