Displaying 1 result from an estimated 1 matches for "babygnu".
2012 Feb 28
3
workflow using git for translations
I did a first set of minor translations to become familiar with the process. These changes have been committed in "main" wine git (how do you call it?).
In the meanwhile, I did a bunch of changes. Now I want to create a patch for these changes. I did a
> git stash save
(and I had a copy of the file somewhere else) and then a
> git pull
Auto-merging po/pt_PT.po
CONFLICT