Merging #1013
Answered
by
pcottle
Majdi-Zlitni
asked this question in
Q&A
Merging
#1013
-
|
Does LearnGitBranching support git merging and resolve conflict? |
Beta Was this translation helpful? Give feedback.
Answered by
pcottle
Sep 15, 2022
Replies: 1 comment
-
|
Merging yes, but not resolving conflicts. That kind of depends on having files to edit and communicating the desired state of the file, which was something I never bothered to implement. It's also a pretty large separate topic that there are other resources for online. |
Beta Was this translation helpful? Give feedback.
0 replies
Answer selected by
Majdi-Zlitni
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Merging yes, but not resolving conflicts. That kind of depends on having files to edit and communicating the desired state of the file, which was something I never bothered to implement. It's also a pretty large separate topic that there are other resources for online.