Multiple Config File Support #766
Conversation
People are able to throw all of their test configs into this folder and they are ignored whilst doing a commit, minimizing the risk that someone uploads a password-containing file to GitHub This commit creates the configs folder
This just makes the config directory to be ignored. Had to do this in two sets to actually put the example files into the folder first.
Also changed the directory for the release config to look for
|
SIMBA: This is documented well, I want to merge. |
|
What do I need to do to resolve the conflicts? A bit new to this. |
|
click 'Use the command line' below this line, many thanks |
|
Sorry, I'm not seeing anywhere to click that? Can you specify a bit more? |
|
hmm, you can search 'Use the command line' in this page.. :) |
|
Yeah, still not seeing it. Are you able to see it since you've got more permissions than I? |
|
Step 1: From your project repository, check out a new branch and test the changes. git checkout -b ColeGreenlee-dev dev git checkout dev |
|
@ColeGreenlee you can also do a quick then you solve merge issues This will update automatically the Pull request and should solve merging issues |
This reverts commit 6370f9b.
This reverts commit c955076.
|
Okay, I done goofed and killed my local stuff. I'm gonna try this again in a second. Thanks for the help |
No description provided.