Merge conflicts with Git

At TIM Group we have a weekly meeting for sharing 5 minute long Lightning talks

This is one of those talks and accompanying slides: a basic introduction to the workflow for resolving conflicts during a merge with Git

Leave a Reply

Your email address will not be published. Required fields are marked *

This site uses Akismet to reduce spam. Learn how your comment data is processed.