[Extend] Merge PR (support squash, etc.) #212

New Issue

Closed

opened 2020-06-03 22:57:25 +00:00 by 6543 · 3 comments

6543 commented

2020-06-03 22:57:25 +00:00

Member

Support different merge modis

merge (default - supported)
squash
rebase & merge
rebase & merge --no-ff

extend #10

Support different merge modis - merge (default - supported) - squash - rebase & merge - rebase & merge --no-ff extend #10

6543 added the

🎯 Enhancement

label 2020-06-03 22:57:25 +00:00

6543 closed this issue

2020-06-03 22:57:25 +00:00

6543 self-assigned this 2020-06-03 22:58:06 +00:00

mmarif commented

2020-06-03 22:58:06 +00:00

Owner

I guess this is API related as all the backend commands are run on gitea server.

I guess this is API related as all the backend commands are run on gitea server.

mmarif commented

2020-06-03 22:58:26 +00:00

Owner

This model can be extended via the API by adding more objects.

https://gitea.com/gitnex/GitNex/src/branch/master/app/src/main/java/org/mian/gitnex/models/MergePullRequest.java

This model can be extended via the API by adding more objects. https://gitea.com/gitnex/GitNex/src/branch/master/app/src/main/java/org/mian/gitnex/models/MergePullRequest.java

6543 commented

2020-06-03 22:58:46 +00:00

Author

Member

@mmarif https://try.gitea.io/api/swagger#/repository/repoMergePullRequest

-> Do* string Enum: [ merge, rebase, rebase-merge, squash ]

json body value "Do" have 4 options

@mmarif https://try.gitea.io/api/swagger#/repository/repoMergePullRequest -> `Do* string Enum: [ merge, rebase, rebase-merge, squash ]` json body value "Do" have 4 options

6543 referenced this issue

2020-06-03 23:05:15 +00:00

[Pull] Extend Merge Options #217

Sign in to join this conversation.

No Label

⌚ Major-release

⌚ Minor-release

⛏️ Breaking

➡️ Frontport

➡️ Needs-frontport

💭 Brainstorming

🔭 Cannot-reproduce

💬 Discussion

📄 Documentation

🎯 Enhancement

🩹 External-dependecy

👋 Good-first-issue

🤾 Google-play

🔙 Has-backport

🚀 Improvement

🚨 Investigate

🔙 Needs-backport

🧺 Needs-cleanup

📡 Needs-feedback

📈 Performance

📌 Priority-critical

📌 Priority-high

📍 Priority-low

📍 Priority-medium

🔙 Regression

💡 Suggestion

🌐 Translation

🙇‍♂️ Needs-help

🛰️ API-dependency

🛡️ Blocked

🗒️ Changelog

🗄️ Repository

🗓️ Summary

No Milestone

No project

No Assignees

2 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: gitnex/GitNex#212

No description provided.