cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-31 00:50:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

MergePullRequest now accepts an atSHA parameter

Browse Source
This commit is contained in:
Cyberboss
2017-11-11 21:49:46 -05:00
parent 8561f9b827
commit 7059ce835d
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGServiceInterface/Components/Repository.cs
+2 -1
View File
@@ -92,9 +92,10 @@ namespace TGServiceInterface.Components
/// Merges the target pull request into the current branch if the remote is a github repository
/// </summary>
/// <param name="PRnumber">The github pull request number in the remote repository</param>
/// <param name="atSHA">The SHA of the pull request to merge</param>
/// <returns><see langword="null"/> on success, error message on failure</returns>
[OperationContract]
string MergePullRequest(int PRnumber);
string MergePullRequest(int PRnumber, string atSHA = null);
/// <summary>
/// Get the currently merged pull requests. Note that switching branches will delete this list and switching back won't restore it