Skip to content

Modify editor patch branch name generation

Vijay Hawoldar requested to merge vij-fix-inconsistent-branch-names into master

What does this MR do?

When a user does does not have permission to push to the target branch when using the Single File Editor, a patch branch name is generated and suggested to them.

This strategy/pattern used to generate the name is different in the SFE to the WebIDE and this MR fixes that to make them the same.

This coincidentally should reduce the number of branch name conflicts that can also occur with the existing implementation, (which just increments a count of existing patch branches) by switching to using time sinch epoch.

The pattern should look like:

{username}-{target-ref}-patch-{time-since-epoch}

More information is available in the related issue, #235512 (closed)

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Screenshots

Before After
sfe-before Screenshot_2020-10-26_at_12.04.01
Edited by Vijay Hawoldar

Merge request reports

Loading