Fixed pulling and merging

Author: Jordonbc

Backend/src/tauri_commands/remotes.rs

@@ -92,6 +92,22 @@ fn looks_like_ssh_auth_failure(msg: &str) -> bool {
         || m.contains("authentication failed")
 }
 
+/// Heuristically detects fast-forward-only divergence failures.
+///
+/// # Parameters
+/// - `msg`: Error text.
+///
+/// # Returns
+/// - `true` when text resembles a diverged ff-only pull.
+/// - `false` otherwise.
+fn looks_like_ff_only_divergence(msg: &str) -> bool {
+    let m = msg.to_lowercase();
+    m.contains("not possible to fast-forward")
+        || m.contains("can't be fast-forwarded")
+        || m.contains("cannot be fast-forwarded")
+        || (m.contains("fast-forward") && m.contains("diverg"))
+}
+
 /// Returns remote URL for a named remote.
 ///
 /// # Parameters
@@ -428,10 +444,10 @@ pub async fn vcs_pull<R: Runtime>(
             });
         }
 
-        info!("Fast-forward pulling '{current}' from {remote}/{upstream_branch}");
+        info!("Pulling '{current}' from {remote}/{upstream_branch}");
         match repo.inner().pull_ff_only(remote, upstream_branch, on) {
             Ok(()) => {
-                info!("Pull (ff-only) completed successfully for branch '{current}'");
+                info!("Pull completed successfully for branch '{current}'");
                 Ok(PullResult {
                     pulled: true,
                     branch: current,
@@ -450,9 +466,20 @@ pub async fn vcs_pull<R: Runtime>(
             }
             Err(e) => {
                 let msg = e.to_string();
+                if looks_like_ff_only_divergence(&msg) {
+                    info!("Pull skipped for branch '{current}': {msg}");
+                    return Ok(PullResult {
+                        pulled: false,
+                        branch: current.clone(),
+                        reason: Some(format!(
+                            "Branch '{current}' diverged from {remote}/{upstream_branch}; fast-forward pull skipped"
+                        )),
+                    });
+                }
+
                 let url = remote_url_for(repo.inner(), remote).unwrap_or_default();
                 emit_ssh_prompt(&app, remote, &url, &msg);
-                error!("Pull (ff-only) failed for branch '{current}': {msg}");
+                error!("Pull failed for branch '{current}': {msg}");
                 Err(msg)
             }
         }
@@ -605,6 +632,27 @@ pub async fn vcs_undo_since_push<R: Runtime>(
     .await
 }
 
+#[cfg(test)]
+mod tests {
+    use super::looks_like_ff_only_divergence;
+
+    #[test]
+    fn detects_fast_forward_only_divergence() {
+        assert!(looks_like_ff_only_divergence(
+            "fatal: Not possible to fast-forward, aborting."
+        ));
+        assert!(looks_like_ff_only_divergence(
+            "hint: Diverging branches can't be fast-forwarded, you need to either:"
+        ));
+    }
+
+    #[test]
+    fn ignores_unrelated_pull_failures() {
+        assert!(!looks_like_ff_only_divergence("permission denied (publickey)"));
+        assert!(!looks_like_ff_only_divergence("could not resolve hostname origin"));
+    }
+}
+
 #[tauri::command]
 /// Soft-resets HEAD to a selected commit, constrained to ahead-of-upstream history.
 ///

Frontend/src/scripts/main.ts

@@ -300,8 +300,9 @@ async function boot() {
             } else {
                 notify((res?.reason ?? 'No upstream configured for this branch; pull skipped') as string);
             }
-        } catch {
-            notify('Pull failed');
+        } catch (e) {
+            const msg = String(e || '').trim();
+            notify(msg ? `Pull failed: ${msg}` : 'Pull failed');
         } finally {
             ctl.clearBusy();
         }

docs/Features.md

@@ -82,7 +82,7 @@ OpenVCS is plugin-first and VCS-agnostic. Features, themes, UI changes, and VCS
   <tr><td>Set remote URL</td><td align="center">✅</td><td>Remote configuration</td></tr>
   <tr><td>Fetch single remote</td><td align="center">✅</td><td>Targeted fetch</td></tr>
   <tr><td>Fetch all remotes</td><td align="center">✅</td><td>Full remote update</td></tr>
-  <tr><td>Pull fast-forward only</td><td align="center">✅</td><td>Conservative pull behaviour</td></tr>
+  <tr><td>Pull</td><td align="center">✅</td><td>Merges remote changes like GitHub Desktop</td></tr>
   <tr><td>Push</td><td align="center">✅</td><td>Push local changes; branches already present on origin are treated as pushable, and first publish establishes upstream tracking</td></tr>
 </table>