v0.1 todos about cs105_nt HOT 14 CLOSED

Going to add sessions and try to get the timeline working now. Is anyone else working on it? I don't want to have conflicts. If not, I will push what I have when I finish. Should I put it in a new branch/do I have to until changes are reviewed? Sorry still trying to figure out git. Thank you all for the help Friday with it.

from cs105_nt.

Thanks for getting the timeline and authentication working! I only just had time to play with the changes, I'm a bit confused with a few places and added comments. We can close this issue and merge to master as nT 0.2 after those get cleared up.

from cs105_nt.

Just made a minor change to the branch to get the timeline search by user working (it was labeled as not working before)

from cs105_nt.

I cleaned up code style with few minor changes. Think it's time to merge to master and finalize 0.1 branch and #3.

from cs105_nt.

I don't think timeline is fully functional yet. I'm making a small change to it and will refactor a few methods.

from cs105_nt.

Do we not have a '/timeline' route anymore? What route displays all the subscribed feeds now?

from cs105_nt.

I made several changes as well, including implementing following. Not sure how we can best resolve everything, we should meet tomorrow to discuss. I don't want to commit anything, as I want to avoid any conflicts.

from cs105_nt.

What is the best way to deal with conflicts in general? For example, I had checked the branch earlier and it was up to date, but now that there are other changes, obviously it is out of date. Is there a way for me to checkout and merge locally with the changes I have made?

from cs105_nt.

@ACHEZ9 Allan, can you commit your changes (or branch this branch)? I'm refactoring some stuff too, don't want to conflict with you changes

from cs105_nt.

Should I commit to a new branch? It seems like several things with routes have been changed as well, so I'm expecting conflicts.

from cs105_nt.

Either way, as long as I can pull your changes. I think if you pull first, resolve the conflicts locally, and then push it will be fine.

from cs105_nt.

If you are not feeling confident with meesed up conflicts from failed auto-merge, copy the files you changes (or whole directory) somewhere else, then use
git checkout -- . && git clean -d -r .
(run at the project root)
to revert all changes. Then pull from remote. Finally manually merge locally.

from cs105_nt.

And IMHO, the best way to avoid conflict is to assign issues to people. To do that, first, issues need to be atomic and primitive. One can post a very specific issue then self-assign it before he/her starts to work on that topic. I believe posting and assigning within github will automatically send out notifications to the team.

from cs105_nt.

I'll close this tomorrow as we have gone over issues from 0.1

from cs105_nt.