search

ryanabury / CMPSC431W_SP17_Project

A database-run website/application for CMPSC 431W.
3 stars 1 forks source link

Create login jsp file #79

Closed jdeshaies23 closed 7 years ago

EthanDRaymond commented 7 years ago

@jdeshaies23 I changed the base branch to be master, because that is the branch you want to merge into.

EthanDRaymond commented 7 years ago

@jdeshaies23 I think you're having a hard time understanding how branches work. Follow this tutorial https://www.atlassian.com/git/tutorials/using-branches .

I think your best bet is to put both the new login page jsp and the java class on one branch. Because they rely on each other.

jdeshaies23 commented 7 years ago

Alright I'll take a look at that, thanks.