search

Cotix / cReddit

CLI Reddit client written in C. Oh, crossplatform too!
Other
96 stars 14 forks source link

Help page #36

Closed rslabbert closed 11 years ago

rslabbert commented 11 years ago

I'm still not entirely sure how to get a handle on all those old commits, but here's a rudimentary help page. Adding new help is as simple as adding a new line and incrementing the array size by one. I'm sure there's an easier way to do this but this is pretty simplistic and it follows the format of the other display functions.

mkilgore commented 11 years ago

Looks pretty good to me, the ending diff looks fine. In the future, you'll probably want to do a work-flow where you pull the latest changes from cotix's copy into your reddit-api, then make a new branch for your new change and make your commits for it there. That way you still have all the clean branches from Cotix's copy as well as your new code separate. If new commits happen before you send in the pull-request, you can do a 'git rebase reddit-api' on your feature branch. All that will do is make your branch come off of the new last commit in the reddit-api branch and then play all your commits on top of it. It's basically like fixing a merge conflict but without doing a commit at the ending and instead fixing the issues upfront.

If you don't want to rebase, you can still just do a git merge just fine (If there are no conflicts, you can do a 'git merge reddit-api --ff' which will avoid a merge commit). It's just best to submit a pull request with only the commits with your functionality and little merge commits, and that's much easier to do if you use a separate branch.

rslabbert commented 11 years ago

All right, I'll start using branches to avoid things like this. Thanks.

mkilgore commented 11 years ago

If you'd like to see an example you could go look over at my cReddit repo. I have a few branches right now, one for each pull-request I've sent in.

Also, I'm getting a better look at your code right now, and there are a few changes that I think will work a bit better. I like the idea of putting the helptext in the split-screen layout. The only thing that I think would help is to integrate it more into the actual display code. I just finished doing some basic refactoring on the code, it's really just a few extra flags into the LinkScreen structure, and a bit more display code in the drawScreen function. Overall I think the code's a bit simpler and easier to manage. I just pushed to a branch over in my repo called 'refactored-help'. I'll send a pull-request a bit later today.