fix: hacer un merge cuando hay cambios #14533

app/jobs/git_pull_job.rb

@@ -8,6 +8,10 @@ class GitPullJob < ApplicationJob
     # @param :message [String]
     # @return [nil]
     def perform(site, usuarie, message)
-      site.repository.merge(usuarie, message) if site.repository.fetch&.positive?
+      site.repository.fetch
+
+      return if site.repository.up_to_date?
+
+      site.repository.merge(usuarie, message)
     end
 end

app/models/site/repository.rb

@@ -111,10 +111,11 @@ class Site
       walker.each.to_a
     end
 
-    # Hay commits sin aplicar?
-    def needs_pull?
-      fetch
-      !commits.empty?
+    # Detecta si hay que hacer un pull o no
+    #
+    # @return [Boolean]
+    def up_to_date?
+      rugged.merge_analysis(remote_head_commit).include?(:up_to_date)
     end
 
     # Guarda los cambios en git