gitea/tea
gitea/tea
56
128
Fork 64
Code Issues 97 Pull Requests 19 Actions Releases 16 Activity

Add tea pr merge #348

Merged
zeripath merged 3 commits from noerw/tea:add-merge into master 2021-03-17 19:56:05 +00:00
Conversation 0 Commits 3 Files Changed 2 +71
noerw commented 2021-03-12 23:54:30 +00:00
Member
Copy Link

fixes #343

fixes #343
👍 1
noerw added the
kind
feature
 label 2021-03-12 23:54:30 +00:00
noerw added 1 commit 2021-03-12 23:54:31 +00:00
All checks were successful
continuous-integration/drone/pr Build is passing
Details
1e7daeaf49
add tea pr merge
noerw added this to the v0.8.0 milestone 2021-03-13 01:24:02 +00:00
lunny reviewed 2021-03-13 07:11:11 +00:00
Dismissed
cmd/pulls/merge.go Outdated
@ -0,0 +1,57 @@
// Copyright 2020 The Gitea Authors. All rights reserved.
lunny commented 2021-03-13 07:11:11 +00:00
Owner
Copy Link

2021?

2021?
6543 marked this conversation as resolved
noerw added 1 commit 2021-03-13 12:42:10 +00:00
All checks were successful
continuous-integration/drone/pr Build is passing
Details
1d8321d9c3
update year
6543 reviewed 2021-03-13 14:13:49 +00:00
Dismissed
6543 left a comment
Owner
Copy Link

as comment

as comment
cmd/pulls/merge.go
@ -0,0 +26,4 @@
&cli.StringFlag{
Name: "style",
Aliases: []string{"s"},
Usage: "Kind of merge to perform: merge, rebase, squash, rebase-merge",
6543 commented 2021-03-13 14:13:49 +00:00
Owner
Copy Link

for squash merge, we need flags for "Title" and "Message" options

for squash merge, we need flags for "Title" and "Message" options
6543 marked this conversation as resolved
6543 reviewed 2021-03-13 14:19:25 +00:00
Dismissed
6543 left a comment
Owner
Copy Link

nit

nit
cmd/pulls/merge.go
@ -0,0 +26,4 @@
&cli.StringFlag{
Name: "style",
Aliases: []string{"s"},
Usage: "Kind of merge to perform: merge, rebase, squash, rebase-merge",
6543 commented 2021-03-13 14:19:25 +00:00
Owner
Copy Link

Default: "merge",

Default: "merge",
6543 marked this conversation as resolved
6543 added 1 commit 2021-03-13 14:31:37 +00:00
All checks were successful
continuous-integration/drone/pr Build is passing
Details
7db6f2ac32
add title & message options + default style value
6543 approved these changes 2021-03-13 14:32:10 +00:00
Dismissed
6543 approved these changes 2021-03-13 15:35:27 +00:00
Dismissed
zeripath approved these changes 2021-03-17 19:55:57 +00:00
Dismissed
zeripath merged commit 0bf844018c into master 2021-03-17 19:56:05 +00:00
zeripath referenced this issue from a commit 2021-03-17 19:56:06 +00:00
Add `tea pr merge` (#348)
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
kind/breaking

   
kind/bug

   
kind/build

   
kind/dependency

   
kind/deployment

   
kind/docs
  
kind
enhancement

  
kind
feature

  
kind/proposal
  
kind
question

  
kind
refactor

  
kind/security

   
kind/testing

   
kind/translation

   
priority/critical

   
priority/high

   
priority/low

   
priority/medium

   
reviewed/duplicate

   
reviewed/invalid

   
reviewed/wontfix

   
skip-changelog

   
status/blocked

   
status/has-backport

   
status/has-pull

   
status/needs-backport

   
status/needs-feedback

   
status/needs-reviews

   
status/wip

   
upstream/gitea

   
upstream/sdk
No Label
kind/breaking
kind/bug
kind/build
kind/dependency
kind/deployment
kind/docs
kind
enhancement
kind
feature
kind/proposal
kind
question
kind
refactor
kind/security
kind/testing
kind/translation
priority/critical
priority/high
priority/low
priority/medium
reviewed/duplicate
reviewed/invalid
reviewed/wontfix
skip-changelog
status/blocked
status/has-backport
status/has-pull
status/needs-backport
status/needs-feedback
status/needs-reviews
status/wip
upstream/gitea
upstream/sdk
Milestone
Clear milestone
No items
No Milestone
v0.8.0
Assignees
Clear assignees
No Assignees
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: gitea/tea#348
No description provided.
Delete Branch "noerw/tea:add-merge"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?