Skip to content

Conversation

@roythearsonist
Copy link
Contributor

@roythearsonist roythearsonist commented Jul 16, 2021

Get stuff from master, that's it

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

5 participants