Bug 245444 - [git-webkit] Handle colliding branch names locally
Summary: [git-webkit] Handle colliding branch names locally
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: Other
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Jonathan Bedard
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2022-09-20 12:35 PDT by Jonathan Bedard
Modified: 2022-09-21 17:05 PDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Bedard 2022-09-20 12:35:45 PDT 
It is often the case that a contributor will re-use a branch name when creating a follow-up fix or gardening change associated with a previous issue. In this case, the contributor may find that they already have a branch with the proposed branch name. We should attempt to rebase that branch by default, and optionally allow the user to delete the existing branch.
Comment 1 Radar WebKit Bug Importer 2022-09-20 12:36:15 PDT 
<rdar://problem/100184775>
Comment 2 Jonathan Bedard 2022-09-20 12:39:18 PDT 
Pull request: https://github.com/WebKit/WebKit/pull/4545
Comment 3 EWS 2022-09-21 14:07:06 PDT 
Committed 254738@main (b0f1b831ed3c): <https://commits.webkit.org/254738@main>

Reviewed commits have been landed. Closing PR #4545 and removing active labels.
Comment 4 EWS 2022-09-21 17:05:31 PDT 
Committed 252432.461@safari-7614-branch (33614424e005): <https://commits.webkit.org/252432.461@safari-7614-branch>

Reviewed commits have been landed. Closing PR #80 and removing active labels.