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

Test how potentially unstaged changes affect the pull? #1

Open
avimehenwal opened this issue Jun 24, 2019 · 3 comments
Open

Test how potentially unstaged changes affect the pull? #1

avimehenwal opened this issue Jun 24, 2019 · 3 comments
Assignees
Labels
task Project task, feature

Comments

@avimehenwal
Copy link
Owner

avimehenwal commented Jun 24, 2019

Test the plugin response on unstaged repository. Plugin SHOULD never (ever) be allowed to do something nefarious with repo.
Should respect the scope as a Helper and NOT a manager

Thanks to https://www.reddit.com/r/fishshell/comments/c4fusb/gitrefresh_new_ohmyfish_plugin_automate_pulling/erwe6d2?utm_source=share&utm_medium=web2x

@avimehenwal avimehenwal added the task Project task, feature label Jun 24, 2019
@avimehenwal avimehenwal self-assigned this Jun 24, 2019
@ccoVeille
Copy link

For this you can use --autostash when using rebase, but the option is only available when using git pull --rebase, not available when using --merge (default option)

@ccoVeille
Copy link

Interesting read

https://stackoverflow.com/questions/6335717/can-git-tell-me-if-a-merge-will-conflict-without-actually-merging

but not sure how you can mix this with the --all, you may have to loop on all branches ... but the code will become more complex then :/

@avimehenwal
Copy link
Owner Author

Thankyou so much @ccoVeille :) You are very kind. I will look into it as soon as I find time by next week. Great day

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
task Project task, feature
Projects
None yet
Development

No branches or pull requests

2 participants