dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-21 12:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feature: supports resolving multiple conflicts at once.

Browse source
This commit is contained in:
leo 2024-04-11 20:50:19 +08:00
parent 3783bdacbc
commit f3f39ac593
8 changed files with 237 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/Commands/Checkout.cs
View file

@ -28,17 +28,31 @@ namespace SourceGit.Commands
return Exec();
}
public bool File(string file, bool useTheirs)
public bool UseTheirs(List<string> files)
{
if (useTheirs)
StringBuilder builder = new StringBuilder();
builder.Append("checkout --theirs --");
foreach (var f in files)
{
Args = $"checkout --theirs -- \"{file}\"";
}
else
{
Args = $"checkout --ours -- \"{file}\"";
builder.Append(" \"");
builder.Append(f);
builder.Append("\"");
}
Args = builder.ToString();
return Exec();
}
public bool UseMine(List<string> files)
{
StringBuilder builder = new StringBuilder();
builder.Append("checkout --ours --");
foreach (var f in files)
{
builder.Append(" \"");
builder.Append(f);
builder.Append("\"");
}
Args = builder.ToString();
return Exec();
}