Do you resolve merge conflicts manually? Using vimdiff? Using another tool?
@j3 Yes. In my experience, most merge conflicts are two methods added to the end of the same class, so it's keeping both + end + \n
You can add location information to your Tweets, such as your city or precise location, from the web and via third-party applications. You always have the option to delete your Tweet location history. Learn more
Do you resolve merge conflicts manually? Using vimdiff? Using another tool?
@j3 Yes. In my experience, most merge conflicts are two methods added to the end of the same class, so it's keeping both + end + \n