Return to Question

added 69 characters in body

Source Link

edited Oct 7, 2019 at 12:31

When I do merge preview m p I see a log of other branch changes for each affected file. Changes marked like this:

@@ -20,6 + 22,7 @@
-    <change>
+    <change>

To merge only a particular file I can do from command line:

git checkout another_branch -- ./path/to/file

(btw, is there a way to do it in Magit?)

BUT, suppose, I want to merge only specific changes from the log, and not the entire file. Is there any way to do that in magit, or git cli? Ideally I'd love to check the changes that I want to merge manually.

When I do merge preview m p I see a log of other branch changes for each affected file. Changes marked like this:

@@ -20,6 + 22,7 @@
-    <change>
+    <change>

To merge only a particular file I can do from command line:

git checkout another_branch -- ./path/to/file

(btw, is there a way to do it in Magit?)

BUT, suppose, I want to merge only specific changes from the log, and not the entire file. Is there any way to do that in magit, or git cli?

When I do merge preview m p I see a log of other branch changes for each affected file. Changes marked like this:

@@ -20,6 + 22,7 @@
-    <change>
+    <change>

To merge only a particular file I can do from command line:

git checkout another_branch -- ./path/to/file

(btw, is there a way to do it in Magit?)

Source Link

asked Oct 7, 2019 at 12:23

Konstantin Rybakov

Magit merging changes manually

When I do merge preview m p I see a log of other branch changes for each affected file. Changes marked like this:

@@ -20,6 + 22,7 @@
-    <change>
+    <change>

To merge only a particular file I can do from command line:

git checkout another_branch -- ./path/to/file

(btw, is there a way to do it in Magit?)

BUT, suppose, I want to merge only specific changes from the log, and not the entire file. Is there any way to do that in magit, or git cli?

magit git