mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-22 04:34:59 +00:00

* do NOT modify the existing merge, and add a new constructor for `Commands.Merge` instead * rewrite `ViewModels.MergeMultiple` - since `_histories.Commits.Find` may returns null, use `List<object>` instead of `List<Models.Commits>` - supports display merge target as both `Models.Commit` and `Models.Branch` * rename translation key `Text.MergeMultiple.Commit` to `Text.MergeMultiple.Targets`, and add translations for zh_CN and zh_TW * some UI/UX changes
24 lines
778 B
C#
24 lines
778 B
C#
using System.Collections.Generic;
|
|
|
|
namespace SourceGit.Models
|
|
{
|
|
public class MergeStrategy
|
|
{
|
|
public string Name { get; internal set; }
|
|
public string Desc { get; internal set; }
|
|
public string Arg { get; internal set; }
|
|
|
|
public static List<MergeStrategy> ForMultiple { get; private set; } = [
|
|
new MergeStrategy("Default", "Let Git automatically select a strategy", string.Empty),
|
|
new MergeStrategy("Octopus", "Attempt merging multiple heads", "octopus"),
|
|
new MergeStrategy("Ours", "Record the merge without modifying the tree", "ours"),
|
|
];
|
|
|
|
public MergeStrategy(string n, string d, string a)
|
|
{
|
|
Name = n;
|
|
Desc = d;
|
|
Arg = a;
|
|
}
|
|
}
|
|
}
|