many uncommited changes in my Github desktop app

[zappfinger]

Since yesterday I have 98 uncommitted changes in my Github app. I did not make these, and the changes already seem to be committed to Github. How do I handle this?

[ghost]

Yes that’s because I’ve commited some changes while doing (and, possibly, commiting) your changes. You need to pull changes from the repo and resolve conflicts if there’re some.

[zappfinger]

When I do a pull, I get this error: error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict.  (128) not sure how to proceed..

…

On 11/03/18 13:30, Eugene Cherny wrote: Yes that’s because I’ve commited some changes while doing (and, possibly, commiting) your changes. You need to pull changes from the repo and resolve conflicts if there’re some. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#15 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AFkYZ5E4QbiMjf7TCmJEFc67rR3jmE1Wks5tdRjVgaJpZM4Sln2b>.

[ghost]

That’s because there were changes in the the upstream in the files you were editing as well. You need to go through the files and resolve conflicts. That should be easy. GitHub app may even have a merger tool.

On Sun, Mar 11, 2018, at 15:52, Richard van Bemmelen wrote: When I do a pull, I get this error: error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>'> hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. (128) not sure how to proceed.. On 11/03/18 13:30, Eugene Cherny wrote: > > Yes that’s because I’ve commited some changes while doing (and, > possibly, commiting) your changes. You need to pull changes > from the> > repo and resolve conflicts if there’re some. > > — > You are receiving this because you authored the thread. > Reply to this email directly, view it on GitHub > <#15 (comment)> > ,> > or mute the thread > <https://github.com/notifications/unsubscribe-auth/AFkYZ5E4QbiMjf7TCmJEFc67rR3jmE1Wks5tdRjVgaJpZM4Sln2b> > .> > — You are receiving this because you commented. Reply to this email directly, view it on GitHub[1], or mute the thread[2].>

Links: 1. #15 (comment) 2. https://github.com/notifications/unsubscribe-auth/AA9eeSb96SkYUyNh_l6TLXcH_XvLm8jzks5tdSw2gaJpZM4Sln2b

[zappfinger]

Solved it by deleting my local repo and fetching everything from this repo.

[ghost]

@zappfinger yup, that’s how it works sometimes! Check this out: http://ohshitgit.com/

[zappfinger]

Nice!

…

On 12/03/18 22:09, Eugene Cherny wrote: @zappfinger <https://github.com/zappfinger> yup, that’s how it works sometimes! Check this out: http://ohshitgit.com/ — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#15 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AFkYZ9RPNTodmvnAwKwrGs7C70eLgENPks5tduP5gaJpZM4Sln2b>.