Hi Mentee,
I would strongly recommend you get some kind of notebook where you can keep your doodles organized. How ever you are most creative is fine, but keeping your sketches organized is going to help you in many ways and allow you to share and demonstrate things in a more professional manner. It's hard for me to communicate with you which one works best because they are so scattered and mixed with the printed content on the paper. Your Logo + Brand Name Brainstorming 1.pdf is a nicely organized example. If you're happy with one of the potential logo options, you should sketch a larger, better, cleaner version on a clean blank workspace so we can see your design really stand out and improve it from there.

Dan
______________________________________________________________________________

Hi Mentee,
I think these are useful questions to have answers to, but it's going to be very difficult to get anyone to answer them all or accurately with such a huge number of them, especially the open ended ones. You need to keep the questions multiple choice and limit them to a total of only a handful of questions. Answer data that a user was willing to take the time to answer accurately will be much more valuable to you than questions that were submitted in a rush with the user simply intending to get through it as quickly as possible. More than 5 questions, and I would say many users will not even want to participate. Having quantifiable data in the form of multiple choice questions, instead of open ended answers will also help to be able to programmatically analyze the data that was received.

Dan
______________________________________________________________________________

Hi Mentee,
The reason that is happening is because the way you have it currently set up, each individual menu is not currently designed to affect the other menus. I think what you're looking for is to have specific states where the other 3 menus are hidden while the one you are interacting with is open. Here's an example of what you're looking to accomplish based on your description:

$("#sub-nav-set").hide();
$("#sub-nav-search").hide();
$("#sub-nav-view").hide();
$("#sub-nav-new").hide();

$(".setbutton").on("click", function(){
  $("#sub-nav-set").toggle();

  $("#sub-nav-search").hide();
  $("#sub-nav-view").hide();
  $("#sub-nav-new").hide();
});
$(".searchbutton").on("click", function(){
  $("#sub-nav-search").toggle();

  $("#sub-nav-set").hide();
  $("#sub-nav-view").hide();
  $("#sub-nav-new").hide();
});
$(".viewbutton").on("click", function(){
  $("#sub-nav-view").toggle();

  $("#sub-nav-set").hide();
  $("#sub-nav-search").hide();
  $("#sub-nav-new").hide();
});
$(".newbutton").on("click", function(){
  $("#sub-nav-new").toggle();

  $("#sub-nav-set").hide();
  $("#sub-nav-search").hide();
  $("#sub-nav-view").hide();
});

______________________________________________________________________________

Hi Mentee,

There are multiple ways to handle this. It's not a fun issue, and I've experienced it myself, but we can resolve it!

Assuming this is the chain of events you performed:
git checkout master
git checkout mentor
- work
git commit
git pull origin master
- merge conflicts

Since there are merge conflicts and your code is already committed, you need to reset your working tree and index to your last commit, removing any merge commits or changes since then.

This command will reset your working tree and index to the last commit, removing the merge commit and subsequent uncommitted changes:
git reset --hard HEAD

After this, the repository should be in the state you had it at before you pulled the master branch into mentor. Now you have to pull your changes out of mentor and into master. To do this, you will need to soft reset your branch to the commit made before your commit:

git reset --soft HEAD^

This places your changes into the index and removes the commit from your branch's local history. Now you need to change branches and commit it properly:

git checkout master
git commit

At this time, you can pull the remote master branch into your local one:
git pull origin master

Then push your changes (and any merge commits) up:
git push origin master

Your repo should be in the state you want now. :)

Dan