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

add notes for random dropdown selection #3132

Merged
merged 4 commits into from
Feb 21, 2017
Merged

add notes for random dropdown selection #3132

merged 4 commits into from
Feb 21, 2017

Conversation

browner12
Copy link
Contributor

related to this Dusk PR

laravel/dusk#140

@browner12
Copy link
Contributor Author

BTW, is there a way I can get rid of these 'merge remote-tracking branch' commits when I send PRs?

@taylorotwell taylorotwell merged commit c3b9f20 into laravel:5.4 Feb 21, 2017
@SebastianS90
Copy link

@browner12 it looks like you have a local 5.4 branch and previously did a --no-ff merge of laravel/5.4 into it. You can always use merge --ff-only when merging upstream to your local unmodified branch to prevent merge commits.
And if you still have merge commits in your PR, then you can rebase it onto the remote branch laravel/5.4.

@browner12
Copy link
Contributor Author

thanks for the info. It looks like this is a common thing with Github desktop users when updating from the origin. It does a merge instead of a rebase. I guess I'll just have to get myself more familiar with the command line git.

@browner12 browner12 deleted the select-random branch May 12, 2017 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants