Search posts, tags, users, and pages
olving merge conflicts is fun! - said no one ever. Nobody likes them, but it doesn’t change the fact that they are, well, part of the job.
Benjamin C. Baker
@benjamincbaker
Avid Coder & Culinary Enthusiast
Markdown supported · ⌘↵ to post
Saikat Roy
Thanks for sharing some of the tricks to avoid regular this regular problem.
Markos Korvesis
Great post, Benjamin C. Baker, kudos! 👏
Especially, the suggestion for the GitLive plugin is
Haha, thank you!!!
Saikat Roy
Thanks for sharing some of the tricks to avoid regular this regular problem.