From 6db080b5f45d948f9fef086a058e60ffad9b8547 Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Tue, 15 Jan 2019 15:39:17 +0100
Subject: [PATCH] GitMerge: For now just take THEIRS as the Merge Strategy
In the future, our strategy can be that we take whichever file has been
modified the latest. That's actually far more reasonable.
---
.../src/main/java/io/gitjournal/gitjournal/GitPullTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/android/app/src/main/java/io/gitjournal/gitjournal/GitPullTask.java b/android/app/src/main/java/io/gitjournal/gitjournal/GitPullTask.java
index 48e43d37..557585c5 100644
--- a/android/app/src/main/java/io/gitjournal/gitjournal/GitPullTask.java
+++ b/android/app/src/main/java/io/gitjournal/gitjournal/GitPullTask.java
@@ -9,6 +9,7 @@ import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.PullCommand;
import org.eclipse.jgit.api.TransportConfigCallback;
import org.eclipse.jgit.api.errors.TransportException;
+import org.eclipse.jgit.merge.MergeStrategy;
import org.eclipse.jgit.transport.Transport;
import org.eclipse.jgit.transport.SshTransport;
@@ -34,7 +35,7 @@ public class GitPullTask extends AsyncTask<String, Void, Void> {
try {
Git git = Git.open(cloneDir);
- PullCommand pullCommand = git.pull();
+ PullCommand pullCommand = git.pull().setStrategy(MergeStrategy.THEIRS);
pullCommand.setTransportConfigCallback(new TransportConfigCallback() {
@Override
public void configure(Transport transport) {