How to selectively combine changes in a merge conflict #1431
Answered
by
jesseduffield
jordan-yee
asked this question in
Q&A
-
|
When resolving merge conflicts, the interface seems very intuitive if you want to resolve the conflict via:
What isn't so obvious to me is how to resolve by selectively combining parts of both changes. Is there a built in or recommended way to do this? |
Beta Was this translation helpful? Give feedback.
Answered by
jesseduffield
Sep 25, 2021
Replies: 1 comment
-
|
Unfortunately we don't have support for more granular editing of files. At the moment I typically open the file in my editor to make fine-tuned changes |
Beta Was this translation helpful? Give feedback.
0 replies
Answer selected by
jordan-yee
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Unfortunately we don't have support for more granular editing of files. At the moment I typically open the file in my editor to make fine-tuned changes