learning some git command to resolved my pull request conflict
I am just curious to learn what did you use? I usually only use my difftool to resolve conflicts.
Knight Tan
Author
my conflicts is simple one, is just a readme file conflict, so I merge the master into my branch, fix the conflict and push it again
Please sign in to leave a comment.