Talk:Gerrit/resolve conflict

It doesn't really say a lot about how you go about efficiently resolving conflicts; it just says "Edit the conflicting file (in this case .gitignore)." Suppose you are changing one part of an i18n file and translatewiki changes another; isn't there some better way to merge the changes besides manually editing and perhaps copying and pasting from one file to the other to get the version that you submit? There's some easy way to do a three-way merge and narrow down what needs to be manually edited to just those particular items that are actually in conflict, right? Leucosticte (talk) 12:36, 6 October 2012 (UTC)