Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Indication that branch has associated stash #7755

Closed
iAmWillShepherd opened this issue Jun 10, 2019 · 11 comments
Closed

Indication that branch has associated stash #7755

iAmWillShepherd opened this issue Jun 10, 2019 · 11 comments
Labels
design-input-needed Issues that require design input from the core team before the work can be started enhancement

Comments

@iAmWillShepherd
Copy link
Contributor

iAmWillShepherd commented Jun 10, 2019

At the moment, the only way to find out if a branch has an associated stash is to check that branch out. Providing branch stash information in the branches list will reduce the number of steps required to determine if a branch has an associated stash.

For now, I think we can use the notification dot pattern we use elsewhere in the app to lead the user to the action that should be completed.

Screen Shot 2019-06-10 at 3 10 30 PM

Once the branch with the notification dot is clicked, the dot could appear next to the action that would complete the workflow.

Screen Shot 2019-06-10 at 3 10 42 PM

cc/ @desktop/design @desktop/product

@billygriffin
Copy link
Contributor

I agree that the problem exists, but I'm not sure I like the dot as a solution, as the dot indicates otherwise that a repo has changes in progress and not yet committed, and I think it could be confusing for the same icon to be used for different concepts. Since we have an icon next to "Stashed changes" in the UI already, we could make use of that in some respect, or some other mechanism. I'd love to hear from @desktop/design on this though.

@outofambit
Copy link
Contributor

Since we have an icon next to "Stashed changes" in the UI already, we could make use of that in some respect

💯 yeah this would be my vote!

i think this is a worthwhile thing to tackle, too!

@iAmWillShepherd
Copy link
Contributor Author

I'm not married to having a dot as a notifier. The dot has had several meanings in the past. An example is the current branch being behind the remote (notification of divergent branches). So I don't fully agree that reusing a dot is confusing, but my view on these dots have always bean along the lines of "hey, something has changed and we suggest you take a look", not that a repo has changes in progress and not yet committed.

It seems we are in agreement on the actual problem and the need for some design input, so I'm good 👍

@donokuda
Copy link
Contributor

Thinking through this a little more, maybe an iteration we can try is grouping branches with stashes under a section:

If the grouping isn't enough, then there might be something we can visually do to differentiate them from the rest of the list:

image

@billygriffin billygriffin added the epic:stashing Tracking label for work related to the stashing flow label Jun 12, 2019
@iAmWillShepherd
Copy link
Contributor Author

@donokuda

I like that! I think the files changed is a nice touch. I'd lean towards the mockup on the left since it states how many files have changed. I worry that the mockup on the right doesn't contain enough context for the user to know what those numbers mean.

What do y'all think, @billygriffin @ampinsk ?

@tierninho
Copy link
Contributor

Might as well toss in another category from a previous future-proposal for "branches with pull requests" #3520

@billygriffin
Copy link
Contributor

billygriffin commented Jun 14, 2019

Adding onto @tierninho's comment above, I'm not sure we should look at this in isolation. I can think of five primarily things about branches that would be helpful to know at a glance (maybe more I'm not thinking of).

  1. When was the last time someone committed to this branch?
  2. Is there uncommitted work on this branch?
  3. Has this branch not been published to the remote? (Branches in branch list give no clear indication of their publication status or whether they contain un-pushed commits #5330)
  4. Is there a stash on this branch?
  5. Is there an open PR on this branch? (Surfacing Pull Request indicator in the Branch list  #3520)

Here's another example of contextual information that someone would like to see for branches: #1977

I guess my question becomes how we convey that context in a way that makes it obvious the state of the branch, and whether all of that is necessary or just some of it (and priority). Thoughts?

@outofambit
Copy link
Contributor

+1 to @billygriffin and @tierninho 's point that this should be looked at holistically. i don't think there's an urgent need to push this change out without spending more time thinking about the larger problem and context.

@tierninho
Copy link
Contributor

tierninho commented Jun 29, 2019

Branch feature On Desktop app Under Branches tab
Name
Date created
Default / Active / Stale
Protected
Commits before/after default branch
Pull Requests + CI
Stashes
Creator
Contributors
Last updated
Uncommitted work
Local / remote

When looking at Github.com, these are the features of a branch that one can view. While we do not need to mirror Github.com, we do have the opportunity to include some of this data to further enhance our branches tab.

@outofambit
Copy link
Contributor

I also want to cross-reference this with #5155 (revisiting the recent branches list) as I think that would be worth considering as part of this work.

@tierninho tierninho added design-input-needed Issues that require design input from the core team before the work can be started and removed epic:stashing Tracking label for work related to the stashing flow labels Jul 23, 2019
@billygriffin
Copy link
Contributor

I'm going to close this issue in favor of #8048. Thanks @tierninho!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
design-input-needed Issues that require design input from the core team before the work can be started enhancement
Projects
None yet
Development

No branches or pull requests

6 participants
@outofambit @donokuda @iAmWillShepherd @billygriffin @tierninho and others