We continue to be blown away by the community that has grown around GitHub Desktop as an open source product. The improved merge flow was a combined effort from and and there were more than 30 merged pull requests from the community since our last release. Celebrating our open source contributorsįinally, we want to call out that this release is the first time we’ve shipped a feature iteration built almost entirely by community contributors outside of GitHub. We conduct user interviews and usability testing on a regular basis-if you’d like to participate and help make Desktop even more useful, please sign up. These changes are subtle, but together they represent our commitment to listen and learn from people using Desktop every day. We solved this by adding a simple way to create, add, or clone a repository right from the repository dropdown. We’ve also seen that the core function of adding a repository to Desktop has been difficult to find and use. With GitHub Desktop 1.5, you can now initiate a merge from the branch dropdown, and you’ll receive feedback in the app to let you know when a merge is completed successfully. We care about your feedback, and this release incorporates several changes based on what we’ve learned from you. The app will now inform you which files have conflicts, route you to your preferred editor to resolve them, list the conflicts that you still need to address, and show you when everything is resolved and ready to merge.Īs we’ve released features related to merging over the past several months, we’ve also had an opportunity to listen to lots of users. And with GitHub Desktop 1.5, you’re no longer on your own. With more than 10 percent of all merges in the app resulting in merge conflicts, we knew we could do better. In our previous release, we reduced some of that anxiety by informing you whether or not you would encounter merge conflicts before merging, but you still needed to actually resolve the conflicts on your own. In our usability tests, the audible “NOOOOO” when encountering a conflict became predictable. Merge conflicts can be intimidating for new developers, especially those working in teams. With today’s GitHub Desktop release, you can merge with confidence knowing that even if conflicts occur, we’ll help you through it so you can keep shipping. It also includes our first step toward improving onboarding onto GitHub Desktop with the option to clone and add new repositories in the repository dropdown. This release completes the merge collaboration cycle by providing a way to initiate a merge in the branch dropdown, guiding you through resolving merge conflicts, and informing you when a merge is complete. Today, we’re releasing GitHub Desktop 1.5, representing a culmination of the work we’ve been doing this past year.
Last month, we released 1.4, providing information about whether or not you’ll encounter conflicts before merging.Earlier this year, we launched Desktop 1.2 and 1.3, providing you with the ability to compare branches and get notified when the default branch has updates to pull into your branch.T17:00:44.438Z - info: Executing push: git -c credential.helper= -c protocol.version=2 push origin master:master -progress (took 2.Since launching the new GitHub Desktop in 2017, we’ve focused on improving collaboration in the app, laying the foundation how you can work with Desktop today. T17:00:42.092Z - info: account found for repository: phaser - photonstorm (has token) T17:00:40.767Z - info: Action 'create commit' for 'photonstorm/phaser' took 0.730s T16:59:19.519Z - info: execPath: 'C:\Users\rdave\AppData\Local\GitHubDesktop\app-2.9.4\GitHubDesktop.exe'
T16:59:19.384Z - info: Last prune took place in a day - skipping T16:59:19.140Z - info: found account: photonstorm (Richard Davey) T16:59:19.139Z - info: loading 106 repositories from store
T16:59:13.026Z - info: Executing getStatus: git -no-optional-locks status -untracked-files=all -branch -porcelain=2 -z (took 2.066s) Please resolve the conflicts before continuing.) (The error was parsed as 6: We found some conflicts while trying to rebase. To abort and get back to the state before "git rebase", run "git rebase -abort".Ĭould not apply 4f50af96e. You can instead skip this commit: run "git rebase -skip". "git add/rm ", then run "git rebase -continue". Resolve all conflicts manually, mark them as resolved with
0 kommentar(er)
