Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Merge commits that aren't merged into develop#753

Merged
amacado merged 5 commits into
developdevicons/devicon:developfrom
masterdevicons/devicon:masterCopy head branch name to clipboard
Jul 16, 2021
Merged

Merge commits that aren't merged into develop#753
amacado merged 5 commits into
developdevicons/devicon:developfrom
masterdevicons/devicon:masterCopy head branch name to clipboard

Conversation

@roythearsonist

@roythearsonist roythearsonist commented Jul 16, 2021

Copy link
Copy Markdown
Contributor

Get stuff from master, that's it

dependabot Bot and others added 5 commits May 11, 2021 02:39
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](npm/hosted-git-info@v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
…git-info-2.8.9

Bump hosted-git-info from 2.8.8 to 2.8.9
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
…4.17.21

Bump lodash from 4.17.20 to 4.17.21
@Thomas-Boi

Copy link
Copy Markdown
Member

@amacado is this a good thing to do? Should we wait till the next release to bring develop up with master? This should be safe but I'm not sure how it'll affect develop's commit history.

@roythearsonist

Copy link
Copy Markdown
Contributor Author

I'm not sure how it'll affect develop's commit history.

I did it for my branch, it's fine

@amacado

amacado commented Jul 16, 2021

Copy link
Copy Markdown
Member

it's fine. just don't squash merge.

@amacado
amacado merged commit 0377141 into develop Jul 16, 2021
@amacado amacado mentioned this pull request Aug 14, 2021
GCHQDeveloper926 pushed a commit to GCHQDeveloper926/devicon that referenced this pull request Dec 20, 2024
Merge commits that aren't merged into develop
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.

4 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.