Thanks for the link, it did help. I got confused because there should have been no conflicts since no one else had submitted a patch for that file, but in fact the committer did remove an extra space, hence the conflict. I still would like to know what is the best practice here and although I am happy to spend time in the translations and read the wine translation and patch pages but I have no motivation to spend further time in learning git which requires quite some investment to be properly understood. I hope this can be found reasonable if people in the community know the answers for what is not in the wine documentation. If I may ask again, I have submitted another patch, which was accepted. I have not made any further changes. Am I supposed to do now a git pull before doing more translation? And what if I do further changes before the patch is accepted? Then I need to git stash save and git pull?
