Files
2012-02-21 01:15:00 -05:00

1 line
2.1 KiB
JSON

[{"user_id": 1822, "stars": [], "topic_id": 14275, "date_created": 1300734555.859061, "message": "if your features get pulled in, you can then merge from upstream", "group_id": 106, "id": 401569}, {"user_id": 1822, "stars": [], "topic_id": 14275, "date_created": 1300734626.8269179, "message": "so other than a rather involved rebase -i, is there a way to \"remove\" a branch from mashup?", "group_id": 106, "id": 401578}, {"user_id": 1822, "stars": [], "topic_id": 14275, "date_created": 1300734405.400943, "message": "I'm thinking of a pattern, but its nascent and wonder if there is something out there better or more developed", "group_id": 106, "id": 401541}, {"user_id": 1822, "stars": [], "topic_id": 14275, "date_created": 1300734419.681066, "message": "the idea is this, you fork a project on github that you want to use", "group_id": 106, "id": 401545}, {"user_id": 1822, "stars": [], "topic_id": 14275, "date_created": 1300734462.515631, "message": "you do that several times, adding >1 feature", "group_id": 106, "id": 401551}, {"user_id": 1822, "stars": [], "topic_id": 14275, "date_created": 1300734453.405961, "message": "you want to be able to contribute back, so you branch to a feature branch, add feature, submit pull", "group_id": 106, "id": 401549}, {"user_id": 1822, "stars": [], "topic_id": 14275, "date_created": 1300734518.868274, "message": "now you want to *USE* that project with all the features you've added so you:\n\ngit co -b mashup\ngit merge feature-1\ngit merge feature-2\ngit merge feature-n", "group_id": 106, "id": 401561}, {"user_id": 1822, "stars": [], "topic_id": 14275, "date_created": 1300734691.2633491, "message": "of course, this assumes that upstream may be slow to pull, or in fact reject your features", "group_id": 106, "id": 401590}, {"user_id": 927, "stars": [], "topic_id": 14275, "date_created": 1300762361.418402, "message": "You should be able to use a filter-branch with some magic in a commit filter to target commits which are only reachable from the victim branch. That'd beg to be a well-tested script\u2026", "group_id": 106, "id": 404627}]