Skip to content

V4 without jquery#27173

Merged
XhmikosR merged 2 commits intotwbs:v4-without-jqueryfrom
aTable:v4-without-jquery
Sep 15, 2018
Merged

V4 without jquery#27173
XhmikosR merged 2 commits intotwbs:v4-without-jqueryfrom
aTable:v4-without-jquery

Conversation

@aTable
Copy link
Copy Markdown
Contributor

@aTable aTable commented Sep 3, 2018

I was using the updated Alert docs as a guide and modernized the button, carousel and collapsible JavaScript docs.

Working my way through them so I thought I'd create this PR to track progress

@Johann-S
Copy link
Copy Markdown
Member

Johann-S commented Sep 3, 2018

You chose the wrong target, your PR should target : v4-without-jquery not v4-dev and your local branch is outdated, please update and create a new PR thanks 👍

@Johann-S Johann-S closed this Sep 3, 2018
@aTable
Copy link
Copy Markdown
Contributor Author

aTable commented Sep 3, 2018

My mistake! Although can you be more specific? I knew something wasn't right but it was late at night..

image

I thought this was the correct target. And did you want me to merge v4-dev into v4-without-jquery?

@Johann-S
Copy link
Copy Markdown
Member

Johann-S commented Sep 4, 2018

Hmm no I made a mistake you targeted the right branch, but your local branch is outdated

@Johann-S
Copy link
Copy Markdown
Member

Johann-S commented Sep 5, 2018

Can you rebase your branch please ? Or can you create a new PR from v4-without-jquery up to date ?

Because currently I can't merge your PR because of there are irrelevant commits

@aTable
Copy link
Copy Markdown
Contributor Author

aTable commented Sep 6, 2018

How's this looking now? =)

@Johann-S
Copy link
Copy Markdown
Member

Johann-S commented Sep 6, 2018

It's the same

image

you made just one commit, not 62 😆

Copy link
Copy Markdown
Member

@Johann-S Johann-S left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you have to use git rebase to update your local branch

@aTable
Copy link
Copy Markdown
Contributor Author

aTable commented Sep 11, 2018

Can you rebase your branch please ? Or can you create a new PR from v4-without-jquery up to date ?

Can you clarify what you want? I thought I did this but looks like I'm wrong. Forking is new to me so will need more guidance

@Johann-S
Copy link
Copy Markdown
Member

@aTable if you followed this to create your PR: https://github.com/twbs/bootstrap/blob/v4-dev/.github/CONTRIBUTING.md#pull-requests

You created a upstream remote, so to update your branch you have to do:

git pull upstream v4-without-jquery --rebase

@Johann-S Johann-S force-pushed the v4-without-jquery branch 2 times, most recently from bc00e49 to c37ae5c Compare September 14, 2018 13:00
@XhmikosR
Copy link
Copy Markdown
Member

Rebased

@XhmikosR XhmikosR merged commit 7af7c99 into twbs:v4-without-jquery Sep 15, 2018
@aTable
Copy link
Copy Markdown
Contributor Author

aTable commented Sep 16, 2018

The assistance is much appreciated. Thanks

mike-odom pushed a commit to mike-odom/bootstrap that referenced this pull request Dec 26, 2025
mike-odom pushed a commit to mike-odom/bootstrap that referenced this pull request Dec 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants