351–360 of 416 posts
Windows, because of the size of the team and the nature of the work, often has VERY large merges across branches (10,000’s of changes with 1,000’s of conflicts). At a former startup, our product was built on Chromium. As the build/release engineer, one of my daily responsibilities was merging Chromium's changes with ours. Just performing the merge and conflict resolution was anywhere from 5 minutes to an hour of my t…
Windows, because of the size of the team and the nature of the work, often has VERY large merges across branches (10,000’s of changes with 1,000’s of conflicts). At a former startup, our product was built on Chromium. As the build/release engineer, one of my daily responsibilities was merging Chromium's changes with ours. Just performing the merge and conflict resolution was anywhere from 5 minutes to an hour of my t…
Windows developed an extension that lets them do conflict resolution in the web. We have a server-side API that it calls into, but the extension isn't fundamentally different from using BeyondCompare or $YOUR_FAVORTE_MERGETOOL.
Linus Torvalds rocks. Windows sucks. Subversion was crap so he just made git instead. git beat out svn, TFS and all that other crap legions of overpaid engineers came up with (or what they didn't get source control???) because unix design philosophy and therein lies the lesson still unlearned for they hath loaded all their bloat into one repo. Windows. It sucks and it will forever suck because it sucks by design. Bil…
Windows, because of the size of the team and the nature of the work, often has VERY large merges across branches (10,000’s of changes with 1,000’s of conflicts). At a former startup, our product was built on Chromium. As the build/release engineer, one of my daily responsibilities was merging Chromium's changes with ours. Just performing the merge and conflict resolution was anywhere from 5 minutes to an hour of my t…
Are you aware of KDiff3[1]? If you are why do you prefer Xcode's opendiff? [1] http://kdiff3.sourceforge.net/
This isn't to say that KDiff3 isn't great - it is.
Earlier quoted context omitted.
For 3-way merging the best tool I've found is Steve Losh's splice.vim ( https://github.com/sjl/splice.vim/ ).
My favorite tool is Meld: http://meldmerge.org/ It's open source. Also: https://stackoverflow.com/questions/572237/whats-the-best-th...
Also KDiff3. Struggling to remember the other ones I used to try unfortunately.
Earlier quoted context omitted.
You have to balance getting work done vs. purity, and Microsoft has spent years trying to fix a bad balance. Windows ME/Vista/8 were terrible and widely hated pieces of software because of "getting things done" instead of making good decisions. They made billions of dollars doing it, don't get me wrong, but they've also lost a lot of market share too and have been piling on bad sentiment for years. They've been pivot…
I assumed that Windows 8 was hated because it broke the Start Menu and tried to force users onto Metro.
I hope they have thought hard about how to get the "Git proxy" for remote sites working well. If they end up with remote sites working on a 15 min - 1 hour old tree that will be very annoying.
Earlier quoted context omitted.
Are you aware of KDiff3[1]? If you are why do you prefer Xcode's opendiff? [1] http://kdiff3.sourceforge.net/
For me, I found I did not need to do 3 way merges that often and opendiff's native UI fits in better than kdiff3 (for me). I think kdiff3 was Qt? Despite Trolltech's best efforts, Qt does not feel native on a Mac. This isn't to say that KDiff3 isn't great - it is.
Still an extremely useful program.
Linus must be very proud - his favourite software Windows - now depends on GIT.
I am very certain that Linus would read this article and curse the jaw dropping stupidity of the whole endeavor. They've basically taken a tool he wrote to do real distributed source control that can scale and turned it into a central server. Git was never meant to be used this way and I know he'd be horrified+amused in the extreme.
At Sun Microsystems, Inc., (RIP) we have many "gates" (repos) that made up Solaris. Cross-gate development was somewhat more involved, but still not bad. Basically: you installed the latest build of all of Solaris, then updated the bits from your clones of the gates in question. Still, a single repo is great if it can scale, and GVFS sounds great! But that's not what I came in to say. I came in to describe the rebase…