Skip to content

cp: handle update prompt with and without interactive mode enabled#6207

Merged
cakebaker merged 1 commit intouutils:mainfrom
BenWiederhake:pr/6069
Apr 11, 2024
Merged

cp: handle update prompt with and without interactive mode enabled#6207
cakebaker merged 1 commit intouutils:mainfrom
BenWiederhake:pr/6069

Conversation

@BenWiederhake
Copy link
Collaborator

This is #6069.

To recap what this PR does: If -u is given, don't consider overwriting. If not considering overwriting, don't ask even if -i is given.

Reason: While trying to rebase and push his PR, I accidentally overwrite Vikrant's main branch, which caused his original PR to be closed, which caused me no longer having implicit write permission to his branch. I guess I'll just never use that GitHub feature again.

@Vikrant2691 Please sanity-check whether this looks correct. git diff says there is no difference in content between c94809b (your original final commit) and 9b9c0cc (this commit).

@cakebaker
Copy link
Contributor

@BenWiederhake: kudos for how you handled this situation :)

@Vikrant2691: thanks for your PR!

@Vikrant2691
Copy link
Contributor

Vikrant2691 commented Apr 11, 2024 via email

@Vikrant2691
Copy link
Contributor

Vikrant2691 commented Apr 11, 2024 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants