New db - #17
Conversation
Project init
database file created Co-Authored-By: flansah <flansah@users.noreply.github.com>
|
@cramsey027 don't merge this into master! Please merge just the json file into the development branch. |
LanceGundersen
left a comment
LanceGundersen
left a comment
There was a problem hiding this comment.
It appears like your db file is blank. I'd suggest creating a new branch off of development and doing a merge request off there. If this one goes to master it will break.
|
lets lay off the hostility with the !!!!!. I am learning by watching youtube videos, and you can't learn unless you try. treat everyone with the respect you would want to receive. |
Drbaltar
left a comment
Drbaltar
left a comment
There was a problem hiding this comment.
We are going to merge our branches into 'development' first before merging anything into 'master'. When you create a 'pull request' on the GitHub website, it gives you a drop-down of which branch to merge into. Instead of selecting 'master', select 'development'. If it says that you can't merge because your branch wasn't pulled from that, then you can clone the 'development' branch into a different directory, create a new branch and add your files into that. Then you can create a pull request for your new branch and the files should merge just fine. I had to do it with my stuff since the 'development' branch hadn't been created when I started coding my subsystems. Please let me know if you have any questions.
3 participants
No description provided.