1

I have been using atom integrated to git/GitHub, and I was trying to push commit to the remote repo. Then, it returns a error that the tip of local repo is behind remote repo. I have tried fetching, pulling, and pushing multiple times and tried to do so in safe mode and force push but no luck. I did not do anything to the remote repo. I do not have access to the git command line. There is multiple branches, and one of the branch is modified.

Also, doing anything related to the git(loading state, history, etc.) from a package will output this error:

'git' �́A���R�}���h�܂��͊O���R�}���h�A
����\�ȃv���O�����܂��̓o�b�` �t�@�C���Ƃ��ĔF������Ă��܂���B

I don't really get what it is... The directory has two-byte characters in username.

Addition: OS is in japanese.

Dan Lowe
  • 51,713
  • 20
  • 123
  • 112
Naruyoko
  • 153
  • 7
  • does the text shown properly on other text editor? i do wonder if you could share your repo link here. i think its related to the selected [encoding on the editor](https://imgur.com/a/rPPiX). you can set it on the right corner of the status bar. – Bagus Tesa Apr 10 '18 at 01:03
  • 1
    @BagusTesa Here is the repo(happens for any repo tho) https://github.com/Naruyoko/many-to-do-less-you-have-to. I was editing branch α0.0.4. And no, the text didn't show up properly on other text editors. – Naruyoko Apr 10 '18 at 02:02
  • Check if you see core.autocrlf true in ~/.gitconfig. What is your OS? What is your Git version? – VonC Apr 10 '18 at 04:42
  • @VonC OS is Windows 10, I don't really know what git version it is but pretty sure the newest. – Naruyoko Apr 10 '18 at 11:17
  • @VonC And, I don't see core.autocrlf in the .gitconfig. – Naruyoko Apr 10 '18 at 23:15
  • sorry, i just got the time to see your repo. it seems you don't have unicode characters there.. i do wonder if it caused by the environment.. could you add the version of the git and how you installed that into the question? it is part of their [known issues](https://github.com/msysgit/msysgit/wiki/Git-for-Windows-Unicode-Support#Known_Issues) that they did not fully support unicode. you might need to fiddle with some [configuration](https://stackoverflow.com/a/36692549/4648586). – Bagus Tesa Apr 12 '18 at 23:54
  • Sort of resolved. Pushed from GitHub Desktop and it worked. – Naruyoko Apr 16 '18 at 23:10

0 Answers0