News for hackers. Stuff that matters.
Re:How Microsoft Office Moved from Source Depot to Git by electroly on Thursday June 12, 2025 @10:48AM (#44258461)
SourceSafe had a great visual merge tool. You could enable multiple checkouts. VSS had tons of real issues but not enabling multiple checkouts was a pain that companies inflicted on themselves. I still miss SourceSafe's merge tool sometimes.
Re:How Microsoft Office Moved from Source Depot to Git by anonymars on Thursday June 12, 2025 @07:29PM (#44264299)
Have you used Visual Studio's git integration? (Note that you could just kick off the merge elsewhere and use VS to manage the conflicts, then commit from back outside. Etc.)