#git merging

Friendex

Add Friending functionality - can now Accept and Deny Friend Requests

Add Friend button also dynamically adds friend request to Friend page

CSS Styling included

Notes

Make sure to include :id in .json.jbuilder file!! Otherwise, won't be able to reference the object by id

Git Branch Merging

Joys-MacBook-Air:Friendex joy$ git status On branch friendships Your branch is ahead of 'origin/friendships' by 3 commits. (use "git push" to publish your local commits) nothing to commit, working directory clean

Rather than git merging (and then having to deal with merge conflicts), if you're only ever working on branch, can just do:

git checkout master - switch to master branch git pull - make sure master branch is up to date git rebase friendships - move master's pointer to the end of friendship's commits git push origin master - update master branch on remote repo