Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow branch naming configuration: "user_base", "user", "base", "none" #11

Closed
jerry-skydio opened this issue Aug 18, 2022 · 0 comments · Fixed by #167
Closed

Allow branch naming configuration: "user_base", "user", "base", "none" #11

jerry-skydio opened this issue Aug 18, 2022 · 0 comments · Fixed by #167
Labels
enhancement New feature or request good first issue Issues that might be a good fit for first time contributors

Comments

@jerry-skydio
Copy link
Collaborator

We have the following behaviors:

If base branch is included in branchname (default today):

  • User can add or remove Branches: to a topic at will. Existing PRs will remain the same.
  • User cannot change the base branch of a PR. This will instead create a new PR

If base branch is not included in branchname:

  • User can freely change the base branch of a PR
  • User cannot have multiple Branches: for a PR or going from 1 branch to >1 branch and vv will create new PRs

There are usability pro/cons to each. Users have requested the ability to change base branch, so it might be worth configuring which of the above 2 options are used.
@jerry-skydio jerry-skydio added the enhancement New feature or request label Aug 18, 2022
@jerry-skydio jerry-skydio added the good first issue Issues that might be a good fit for first time contributors label Sep 14, 2022
@jerry-skydio jerry-skydio changed the title Allow base_branch inclusion in branchname to be configurable Allow branch naming configuration: "user_base", "user", "base", "none" Mar 13, 2024
jerry-skydio added a commit that referenced this issue Mar 13, 2024
@jerry-skydio
upload: Add "branch-format" config option and commit tag
83b6db2 
Branch-format will let you control how branches are named,
which has an effect on when branches collide. This can be
set on cmdline, from config file, or on a topic-by-topic
basis inside the commit text.

user+branch is the default today and will remain the default.
Branch names will never collide if using this, but you cannot
retarget to other base branches, and you must use Uploader: if
another user wants to push to this branch.

user allows retargeting prs to other base branches, but will
not allow multiple base-branches to be specified. if they are,
it will warn to specify user+branch instead.

branch will allow others to upload to the same pr, but uploader:
cannot be used.

none includes both limitations and features of user and branch.

I don't really believe there's good use cases for branch and none,
but i'm implementing them to be complete.

Fixes: #11
@jerry-skydio jerry-skydio mentioned this issue Mar 13, 2024
Merged
jerry-skydio added a commit that referenced this issue Mar 13, 2024
@jerry-skydio
upload: Add "branch-format" config option and commit tag
62c9a47 
Branch-format will let you control how branches are named,
which has an effect on when branches collide. This can be
set on cmdline, from config file, or on a topic-by-topic
basis inside the commit text.

user+branch is the default today and will remain the default.
Branch names will never collide if using this, but you cannot
retarget to other base branches, and you must use Uploader: if
another user wants to push to this branch.

user allows retargeting prs to other base branches, but will
not allow multiple base-branches to be specified. if they are,
it will warn to specify user+branch instead.

branch will allow others to upload to the same pr, but uploader:
cannot be used.

none includes both limitations and features of user and branch.

I don't really believe there's good use cases for branch and none,
but i'm implementing them to be complete.

Fixes: #11
jerry-skydio added a commit that referenced this issue Mar 13, 2024
@jerry-skydio
upload: Add "branch-format" config option and commit tag
1a5080f 
Branch-format will let you control how branches are named,
which has an effect on when branches collide. This can be
set on cmdline, from config file, or on a topic-by-topic
basis inside the commit text.

user+branch is the default today and will remain the default.
Branch names will never collide if using this, but you cannot
retarget to other base branches, and you must use Uploader: if
another user wants to push to this branch.

user allows retargeting prs to other base branches, but will
not allow multiple base-branches to be specified. if they are,
it will warn to specify user+branch instead.

branch will allow others to upload to the same pr, but uploader:
cannot be used.

none includes both limitations and features of user and branch.

I don't really believe there's good use cases for branch and none,
but i'm implementing them to be complete.

Fixes: #11
jerry-skydio added a commit that referenced this issue Mar 13, 2024
@jerry-skydio
upload: Add "branch-format" config option and commit tag
a8eb317 
Branch-format will let you control how branches are named,
which has an effect on when branches collide. This can be
set on cmdline, from config file, or on a topic-by-topic
basis inside the commit text.

user+branch is the default today and will remain the default.
Branch names will never collide if using this, but you cannot
retarget to other base branches, and you must use Uploader: if
another user wants to push to this branch.

user allows retargeting prs to other base branches, but will
not allow multiple base-branches to be specified. if they are,
it will warn to specify user+branch instead.

branch will allow others to upload to the same pr, but uploader:
cannot be used.

none includes both limitations and features of user and branch.

I don't really believe there's good use cases for branch and none,
but i'm implementing them to be complete.

Fixes: #11
jerry-skydio added a commit that referenced this issue Mar 13, 2024
@jerry-skydio
upload: Add "branch-format" config option and commit tag
5952c05 
Branch-format will let you control how branches are named,
which has an effect on when branches collide. This can be
set on cmdline, from config file, or on a topic-by-topic
basis inside the commit text.

user+branch is the default today and will remain the default.
Branch names will never collide if using this, but you cannot
retarget to other base branches, and you must use Uploader: if
another user wants to push to this branch.

user allows retargeting prs to other base branches, but will
not allow multiple base-branches to be specified. if they are,
it will warn to specify user+branch instead.

branch will allow others to upload to the same pr, but uploader:
cannot be used.

none includes both limitations and features of user and branch.

I don't really believe there's good use cases for branch and none,
but i'm implementing them to be complete.

Fixes: #11
jerry-skydio added a commit that referenced this issue Mar 13, 2024
@jerry-skydio
upload: Add "branch-format" config option and commit tag
1ed3ddd 
Branch-format will let you control how branches are named,
which has an effect on when branches collide. This can be
set on cmdline, from config file, or on a topic-by-topic
basis inside the commit text.

user+branch is the default today and will remain the default.
Branch names will never collide if using this, but you cannot
retarget to other base branches, and you must use Uploader: if
another user wants to push to this branch.

user allows retargeting prs to other base branches, but will
not allow multiple base-branches to be specified. if they are,
it will warn to specify user+branch instead.

branch will allow others to upload to the same pr, but uploader:
cannot be used.

none includes both limitations and features of user and branch.

I don't really believe there's good use cases for branch and none,
but i'm implementing them to be complete.

Fixes: #11
@jerry-skydio jerry-skydio mentioned this issue Mar 13, 2024
Closed
jerry-skydio added a commit that referenced this issue Mar 13, 2024
@jerry-skydio
upload: Add "branch-format" config option and commit tag
dfdff14 
Branch-format will let you control how branches are named,
which has an effect on when branches collide. This can be
set on cmdline, from config file, or on a topic-by-topic
basis inside the commit text.

user+branch is the default today and will remain the default.
Branch names will never collide if using this, but you cannot
retarget to other base branches, and you must use Uploader: if
another user wants to push to this branch.

user allows retargeting prs to other base branches, but will
not allow multiple base-branches to be specified. if they are,
it will warn to specify user+branch instead.

branch will allow others to upload to the same pr, but uploader:
cannot be used.

none includes both limitations and features of user and branch.

I don't really believe there's good use cases for branch and none,
but i'm implementing them to be complete.

Fixes: #11
jerry-skydio added a commit that referenced this issue Mar 13, 2024
@jerry-skydio
upload: Add "branch-format" config option and commit tag
d29851a 
Branch-format will let you control how branches are named,
which has an effect on when branches collide. This can be
set on cmdline, from config file, or on a topic-by-topic
basis inside the commit text.

user+branch is the default today and will remain the default.
Branch names will never collide if using this, but you cannot
retarget to other base branches, and you must use Uploader: if
another user wants to push to this branch.

user allows retargeting prs to other base branches, but will
not allow multiple base-branches to be specified. if they are,
it will warn to specify user+branch instead.

branch will allow others to upload to the same pr, but uploader:
cannot be used.

none includes both limitations and features of user and branch.

I don't really believe there's good use cases for branch and none,
but i'm implementing them to be complete.

Fixes: #11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request good first issue Issues that might be a good fit for first time contributors
Projects
None yet
Milestone
No milestone
1 participant
@jerry-skydio