Layout restructure, add premake5 and configure CI services#2
Open
Necktrox wants to merge 1 commit intomultitheftauto:masterfrom
Open
Layout restructure, add premake5 and configure CI services#2Necktrox wants to merge 1 commit intomultitheftauto:masterfrom
Necktrox wants to merge 1 commit intomultitheftauto:masterfrom
Conversation
Necktrox
force-pushed
the
feature/premake
branch
2 times, most recently
from
2efcb77 to
a542e55
Compare
Member
|
How to fix conflicts? |
Member
|
Probably would be best to rebase & then use meld to fix merge conflicts |
Necktrox
force-pushed
the
feature/premake
branch
2 times, most recently
from
701f06f to
5317855
Compare
Necktrox
force-pushed
the
feature/premake
branch
from
5317855 to
c3fd1f5
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request is massive, but there have been almost zero changes to the each module code and only the mentioned features in the title have been made.