Post Reply 
 
Thread Rating:
  • 2 Votes - 3 Average
  • 1
  • 2
  • 3
  • 4
  • 5
GitHub for Windows
06-05-2013, 07:09 PM (This post was last modified: 07-01-2013 01:31 PM by vnctdj.)
Post: #1
Sad GitHub for Windows
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 :

[Image: 947783661.png]

What should I do to bypass this problem ?

♦ Intel Core i7-6700HQ | 16 GB RAM | NVIDIA GeForce GTX 960M | Debian Testing
♦ Intel Core i7-2630QM | 4 GB RAM | NVIDIA GeForce GT 540M | Debian Testing
♦ PSP-3004 | 6.60 PRO-C2
Find all posts by this user
Quote this message in a reply
06-05-2013, 07:10 PM
Post: #2
RE: GitHub for Windows
Open a shell and type "git status", it should tell you more about what could be wrong.

-[Unknown]
Find all posts by this user
Quote this message in a reply
06-05-2013, 07:17 PM
Post: #3
RE: GitHub for Windows
(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 Smile

I typed "git status" and I got this :

[Image: 542073391.png]

What should I do to sync all the commits now ? Huh

♦ Intel Core i7-6700HQ | 16 GB RAM | NVIDIA GeForce GTX 960M | Debian Testing
♦ Intel Core i7-2630QM | 4 GB RAM | NVIDIA GeForce GT 540M | Debian Testing
♦ PSP-3004 | 6.60 PRO-C2
Find all posts by this user
Quote this message in a reply
06-06-2013, 03:54 AM
Post: #4
RE: GitHub for Windows
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]
Find all posts by this user
Quote this message in a reply
06-06-2013, 08:58 PM
Post: #5
RE: GitHub for Windows
Thanks for taking time to help me Smile

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

[Image: 779732391.png]

I really don't understand Huh

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

[Image: 504787442.png]

♦ Intel Core i7-6700HQ | 16 GB RAM | NVIDIA GeForce GTX 960M | Debian Testing
♦ Intel Core i7-2630QM | 4 GB RAM | NVIDIA GeForce GT 540M | Debian Testing
♦ PSP-3004 | 6.60 PRO-C2
Find all posts by this user
Quote this message in a reply
06-07-2013, 12:14 AM
Post: #6
RE: GitHub for Windows
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]
Find all posts by this user
Quote this message in a reply
06-07-2013, 01:09 PM
Post: #7
RE: GitHub for Windows
(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 ! Smile
Thank you very much [Unknown], and excuse me about my ignorance, I'm a beginner in all that stuff Wink

♦ Intel Core i7-6700HQ | 16 GB RAM | NVIDIA GeForce GTX 960M | Debian Testing
♦ Intel Core i7-2630QM | 4 GB RAM | NVIDIA GeForce GT 540M | Debian Testing
♦ PSP-3004 | 6.60 PRO-C2
Find all posts by this user
Quote this message in a reply
06-08-2013, 08:38 PM
Post: #8
RE: GitHub for Windows
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
Find all posts by this user
Quote this message in a reply
06-08-2013, 08:52 PM
Post: #9
RE: GitHub for Windows
(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 ! Smile

♦ Intel Core i7-6700HQ | 16 GB RAM | NVIDIA GeForce GTX 960M | Debian Testing
♦ Intel Core i7-2630QM | 4 GB RAM | NVIDIA GeForce GT 540M | Debian Testing
♦ PSP-3004 | 6.60 PRO-C2
Find all posts by this user
Quote this message in a reply
06-09-2013, 07:10 AM (This post was last modified: 06-09-2013 05:44 PM by vnctdj.)
Post: #10
RE: GitHub for Windows
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 Undecided

♦ Intel Core i7-6700HQ | 16 GB RAM | NVIDIA GeForce GTX 960M | Debian Testing
♦ Intel Core i7-2630QM | 4 GB RAM | NVIDIA GeForce GT 540M | Debian Testing
♦ PSP-3004 | 6.60 PRO-C2
Find all posts by this user
Quote this message in a reply
Post Reply 


Forum Jump: