[git][iostreams] Forking without an established merge point
If I look at the develop branch of Boost.Iostreams then GitHub says that "This branch is 253 commits ahead and 91 commits behind master". It appears that Boost.Iostreams has not established a merge point between master and develop as described in: https://svn.boost.org/trac/boost/wiki/PostCvtMergePoint I am trying to fork Boost.Iostreams to create some patches for it. Normally I would need to work off the develop branch (or a branch originating from develop), but if I do so my pull-requests will include the entire commit history of the component. If I look at the network graph of Iostreams, it appears that everybody else branches off the master branch. How do I proceed?
On 31 March 2014 11:35, Bjorn Reese
If I look at the develop branch of Boost.Iostreams then GitHub says that "This branch is 253 commits ahead and 91 commits behind master".
It's not that bad. It's only the Stephen Kelly changes that haven't been merged. We need to decide what to do with them. It appears that Boost.Iostreams has not established a merge point
between master and develop as described in:
An appropriate merge base would be dd73949749da272867bef1c5bcb5d2925601c020, apart for a file permission difference, it's identical to the previous commit on origin/master. I'll do that tonight if no one objects - it's a good idea to do this whatever we do with the changes in develop.
On 03/31/2014 01:12 PM, Daniel James wrote:
An appropriate merge base would be dd73949749da272867bef1c5bcb5d2925601c020, apart for a file permission difference, it's identical to the previous commit on origin/master. I'll do that tonight if no one objects - it's a good idea to do this whatever we do with the changes in develop.
That will suit me just fine.
participants (2)
-
Bjorn Reese -
Daniel James