Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
open Git pane when merge conflicts are present #1709
Description of the Change
When I was working on #1704, I noticed
Doing a bit of code archaeology, it looks like we used to pop open the git tab automatically when merge conflicts were present. I don't think we intentionally removed this functionality, so let's bring it back.
My reasons for wanting to revive this functionality are anecdotal: an old coworker of mine discovered the git tab because it popped open when there were merge conflicts.
Users can resolve merge conflicts more easily within Atom since the git tab is already open. It might improve discoverability of the git tab by showing it to the user at an opportune moment.
Users who don't want to resolve their merge conflicts in Atom might be annoyed about the git pane opening.
Instrumenting when the git tab opens doesn't tell us much, since we're doing that automatically. I'm curious if users are using the git tab after it's open, but we don't have "funnel" instrumentation that easily allows us to track which actions were taken immediately before. Thus, I'm not adding any metrics instrumentation to this pull request.