+ [2015-08-31T22:24:50Z] cyrus_mc ideally development stays around for ever. You develop a new feature, merge it into production when tested and then continue to develop
+ [2015-08-31T22:24:59Z] tobiasvl all right. that's fine too
+ [2015-08-31T22:27:57Z] tobiasvl cyrus_mc: what you do after you've merged the pull request, when you want to do new work on development, you do "git rebase master"
+ [2015-08-31T22:28:17Z] tobiasvl and voila, you're not behind anymore. you integrate the production branch's merge commit into development

message no. 110103

Posted by cyrus_mc in #github at 2015-08-31T22:21:46Z

evne if I do it all from the command line. Push my dev, then checkout prod and merge and push prod it ends up saying dev is 1 commit behind production
+ [2015-09-01T01:55:56Z] fahadash Can I modify an existing PR by adding a few newer commits to it?
+ [2015-09-01T01:58:28Z] thibaultcha fahadash Just push to the same branch
+ [2015-09-01T01:58:35Z] fahadash I just noticed
+ [2015-09-01T01:58:38Z] fahadash Github is amazing
+ [2015-09-01T06:14:07Z] VxJasonxV thibaultcha: it's better to encourage branching