0

Hi I have forked a repository. Several months have passed and I want to get it back in sync with the original repo. I have added several extra files in my own repo and added some files to gitignore. I have read that you can do this online since march 6 or something but it shows: enter image description here

Some binary files need merge? why can't I just get the remote version? enter image description here

git status: enter image description here

I always have trouble with conflicts and .orgin files. Perhaps I am handling kdiff3 wrong? I could use a few pointers. Too bad that the official windows client (wpf) does not help out with getting back in sync with the origin remote.

edit as @ppittle suggested, I tried the sourcetree client and wanted to resolve a dll thing by clicking on resolve using theirs and it gave me: enter image description here

JP Hellemons
  • 5,977
  • 11
  • 63
  • 128
  • Try using [SourceTree](http://www.sourcetreeapp.com/), a free Git client for Windows (and Mac). It wont magically fix your conflicts, but it makes working with git much easier than using the official client / command line. – Philip Pittle Jun 04 '14 at 10:05
  • This might also help: https://www.youtube.com/watch?v=fdK_q3Pcp9s – Philip Pittle Jun 04 '14 at 10:06

0 Answers0