search

simonwagner / mergepbx

script for merging XCode project files in git
GNU General Public License v3.0
1.04k stars 46 forks source link

mergepbx is not work in my japanese environment #5

Closed tokorom closed 10 years ago

tokorom commented 10 years ago

I made a simple project for checking. I added a new file in the branch 'test1', and added a new file in the branch 'test2'. Then I tried to merge 'test1' and 'test2', but I was warned this errors.

$ git checkout test1
Switched to branch 'test1'

$ git merge test2
merging failed: 'ascii' codec can't encode characters in position 0-1: ordinal not in range(128)
Auto-merging DummyProjectForMergepbx.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in DummyProjectForMergepbx.xcodeproj/project.pbxproj
Automatic merge failed; fix conflicts and then commit the result.

This project include that branches is here -> https://github.com/tokorom/DummyProjectForMergepbx

and my LANG environment variable is ja_JP.UTF-8.

$ echo $LANG
ja_JP.UTF-8
simonwagner commented 10 years ago

I have released a new version (v0.5). Please try it out, your example project now merges without any errors and the result looks correct.

tokorom commented 10 years ago

I was also able to confirm that the errors will not occur in the latest version. mergepbx is very cool!