-
Notifications
You must be signed in to change notification settings - Fork 309
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
Add push/pull actions #246
Comments
|
|
Out of the two options above I prefer keeping the push/pull actions exposed as in #2. I don't think it makes sense to make somebody view their git log in order to update their remotes and pull. |
Agree on #2. |
Regarding #2, I would making the push/pull button visible, but disabled, and adding a tooltip to show why they are disabled. There should also be a way to switch to the terminal quickly to see the actual merge conflicts Regarding #3, @weihwang do we have any mockups which show the state of the push/pull UX in that scenario? Thanks! |
The final frame of this is showing a fly-out window for details. Do we also have an option that would expand in the sidebar? We don't currently have any fly-out interactions with out sidebars at this point in JupyterLab. |
@tgeorgeux added an inline option. Is there any styling for links, or guidance for icon based actions vs. text? |
|
Released in 0.5 |
Proposals to add push/pull actions to the plugin.
https://www.figma.com/file/UyNpeQNuTj6Uv74MoEJDh3ji/Git-extension?node-id=507%3A1156
Pre-requisite
#244 - Surface target branch to inform users before they make a pull/push action.
Option 1
![image](https://user-images.githubusercontent.com/551333/46972017-625e5a80-d072-11e8-88e8-5bdc4190be48.png)
Push/pull actions embedded in a history tab #245 (more overview info for history) to provide context to these actions.
Option 2
![image](https://user-images.githubusercontent.com/551333/46972203-ddc00c00-d072-11e8-9ee5-5ce25b98ed16.png)
Push/pull actions at a high level (icons TBD) to allow push pull with history view, or working environment view.
TASK BREAKDOWN
The text was updated successfully, but these errors were encountered: