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

Merge commits that aren't merged into develop #753

Merged
merged 5 commits into from
Jul 16, 2021
Merged

Merge commits that aren't merged into develop #753

merged 5 commits into from
Jul 16, 2021

Conversation

roythearsonist
Copy link
Contributor

@roythearsonist roythearsonist commented Jul 16, 2021

Get stuff from master, that's it

dependabot bot and others added 5 commits May 11, 2021 02:39
…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
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
Contributor Author

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

I did it for my branch, it's fine

@amacado
Copy link
Member

amacado commented Jul 16, 2021

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
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