a couple of laughzillas on a blue diamond background

GitHub Desktop 1.5 makes it easy to resolve frustrating merge conflicts

Nov15
by on November 15, 2018 at 2:00 pm
Posted In: Around the Web, Design & Dev


GitHub today announced a major update to its visual Git client, GitHub Desktop. Version 1.5 introduces a new way to resolve merge conflicts, which are inevitable when working on a project with a team. Previous versions of GitHub Desktop merely warned if a conflict would occur, leaving resolution entirely in the hands of the developer. With GitHub Desktop 1.5, the app will list the files with conflicts, open your preferred editor to fix them, and let you know when everything is ready to merge. Here’s a GIF showing how it works in practice. GitHub launched GitHub Desktop in 2017, which…

This story continues at The Next Web

Or just read more coverage about: GitHub

└ Tags: 
a couple of laughzillas on a blue diamond background

GitHub Desktop 1.5 makes it easy to resolve frustrating merge conflicts

Nov15
by on November 15, 2018 at 2:00 pm
Posted In: Around the Web, Design & Dev


GitHub today announced a major update to its visual Git client, GitHub Desktop. Version 1.5 introduces a new way to resolve merge conflicts, which are inevitable when working on a project with a team. Previous versions of GitHub Desktop merely warned if a conflict would occur, leaving resolution entirely in the hands of the developer. With GitHub Desktop 1.5, the app will list the files with conflicts, open your preferred editor to fix them, and let you know when everything is ready to merge. Here’s a GIF showing how it works in practice. GitHub launched GitHub Desktop in 2017, which…

This story continues at The Next Web

Or just read more coverage about: GitHub

└ Tags: 
a couple of laughzillas on a blue diamond background

Report: Microsoft’s enterprise products covertly gather personal data on users

Nov15
by on November 15, 2018 at 1:11 pm
Posted In: Around the Web


Microsoft collects and stores personal data about the behavior of individual users of its enterprise offerings on a large scale, without any public documentation — according to a new report by Privacy Company. The data protection impact assessment (DPIA) was commissioned by the Dutch government to guide its institutions — which includes 300,000 workstations in ministries, the judiciary, the police, tax authorities, etc. — in their dealings with Microsoft‘s enterprise software. In a blog post discussing the findings of the report, Privacy Company clearly states that the results of the DPIA on Microsoft Office ProPlus for enterprises are alarming. Microsoft systematically…

This story continues at The Next Web

Or just read more coverage about: Microsoft

└ Tags: , , ,