14 tips and tools to resolve conflicts with Git

Resolving conflicts can sometimes be a real pain even if you are an experienced developer. This list include some nice tips on how to make your life easier when dealing with conflicts for Git users.
https://developer.atlassian.com/blog/2015/12/tips-tools-to-solve-git-conflicts/

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s