5.0 dev packer initial merge #136
Merged
Conversation
This file contains 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
…se_box into 5.0-dev_packer from master samuraiwtf repo
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
so, there are a lot of duplicate files here. this happened when I was trying to pull all the katana changes from the 5.0-dev branch of SamuraiWTF.
For now I would like to leave the files, because I haven't figured out all the different ones I had to modify to make them work with packer. My plan is to eventually have the files in the root of the folder ( install and config ) be the ones that I overwrite in my folder
base/packer/scripts/build/(install and config), and when I do that I will diff the files to see what I changed and add those changes again. The reason why I want to have the folders at the root of the repo overwrite mine is because they still have the proper git history attached to those file, and I can just add my alteration on top of the proper git history so the proper people are represented in the file history.this is all correlated to issue #116, but does not close it because the base box isn't complete