GitHub for Windows

[vnctdj]

I encounter an issue with the GitHub's software for Windows.

It happens when I try to sync the commits as you can see on this screenshot :



What should I do to bypass this problem ?

[[Unknown]]

Open a shell and type "git status", it should tell you more about what could be wrong.

-[Unknown]

[vnctdj]

(06-05-2013 07:10 PM)[Unknown] Wrote:  Open a shell and type "git status", it should tell you more about what could be wrong.

-[Unknown]

Thanks for your reply

I typed "git status" and I got this :



What should I do to sync all the commits now ?

[[Unknown]]

This means that your editor changed the *.vcxproj files. Probably you upgraded them. The easiest thing to do is (from that shell):

git checkout Common Core GPU UI ext Windows headless unittest
cd native && git checkout native.vcxproj && cd ..

This will reset everything. Another option you have is committing your changes, but you may end up with conflicts that way.

-[Unknown]

[vnctdj]

Thanks for taking time to help me

Apparently "git checkout Common Core GPU UI ext Windows headless unittest" did nothing
And "cd native && git checkout native.vcxproj && cd .." gave me an error with the "&&"



I really don't understand

And now I get this when I type "git status" :

[[Unknown]]

Wait, now they are marked ready to be committed?

git reset HEAD Common Core GPU UI Windows ext headless unittest
git checkout Common Core GPU UI Windows ext headless unittest

Sorry, forgot it was PowerShell, but seems like native is okay now anyway.

-[Unknown]

[vnctdj]

(06-07-2013 12:14 AM)[Unknown] Wrote:  Wait, now they are marked ready to be committed?

git reset HEAD Common Core GPU UI Windows ext headless unittest
git checkout Common Core GPU UI Windows ext headless unittest

Sorry, forgot it was PowerShell, but seems like native is okay now anyway.

-[Unknown]

I finally succeed in fixing my problem thanks to your help !
Thank you very much [Unknown], and excuse me about my ignorance, I'm a beginner in all that stuff

[Orphis]

Running all these should give you a pristine state again:
git clean -dfx
git submodule foreach git clean -dfx
git reset --hard HEAD
git pull origin master (run this if you want the latest)
git submodule update --init --recursive

[vnctdj]

(06-08-2013 08:38 PM)Orphis Wrote:  Running all these should give you a pristine state again:
git clean -dfx
git submodule foreach git clean -dfx
git reset --hard HEAD
git pull origin master (run this if you want the latest)
git submodule update --init --recursive

Thanks !

[vnctdj]

I don't know why, but the problem still appear...
I have to use the commands provided by Orphis each time i want to sync my files