i didnt get how kdiff3 works. i can only do automerge, but not manual. i preffer meld, as it works white like my client i had for SVN. i also think it is the most windows user friendly one, though it runs unstable here :D
This CRLF conversion thing is troubling me. The only autocrlf setting that works (does not corrupt the MSVS files) is the default one. But with this setting, GIT seems to think I have modified a lot of files, even though I have a clean checkout. So I end up picking files to commit manually. Not very nice.
Joined: 01 Jun 2005, 10:36 Location: The Netherlands
IMO someone should make one big commit converting everything to LF in the repository, so after that autocrlf = true works fine. (That also works fine with MSVC project files.)
IMO a repository with mixed line endings is close to unhandleable, because you keep having either half/full file diffs, because various otherwise good editors insist on making line endings consistent, or you keep having to change the core.autocrlf setting depending on the line ending of the files you want to commit / in the branch you are in / etc.
Initialized empty Git repository in C:/prj/vc/spring_git/ Getting alternates list for http://github.com/spring/spring.git Also look at http://github.com/Auswaschbar/spring.git/ Getting pack list for http://github.com/spring/spring.git Getting index for pack a2c058911374cf87896c24904d1660a68227e362 Getting index for pack 3d39d8b72cb25a8ea1c7ebc4da16ad8df9fe1965 Getting index for pack a49d844b48738e49fefe647bbf160f586aa4a038 Getting index for pack 252a9dc10aab7d88855b0eb3dbcf50f3ba195f00 Getting index for pack 83374796de51634227460a2f98ffaa83138551cf Getting index for pack e5f1ebb0da74ceb1f5ba1cc3637c81b6ff1de528 Getting index for pack f8364dc668d54f5ad34fdadfcd8d1389c4b65364 Getting pack list for http://github.com/Auswaschbar/spring.git/ error: Unable to find 0000000000000000000000000000000000000000 under http://github.com/spring/spring.git Cannot obtain needed object 0000000000000000000000000000000000000000 fatal: Fetch failed.
What can i do else to get the latest source files?
Users browsing this forum: No registered users and 1 guest
You cannot post new topics in this forum You cannot reply to topics in this forum You cannot edit your posts in this forum You cannot delete your posts in this forum You cannot post attachments in this forum