Ok. What would be the correct git workflow for this rebasing?
Von: Dev [mailto:dev-bounces@dynare.org] Im Auftrag von Houtan
Gesendet: Montag, 8. Juni 2015 14:42
An: List for Dynare developers
Betreff: Re: [DynareDev] Open pull requests
Ideally they would have been merged before this divergence occurred.
But, since it has happened, the best thing to do would be to rebase the branch with the changes on top of the current position of master, resolving the differences by hand. Then update the pull request.
Best,
Houtan
On 06/08/2015 01:21 PM, Johannes Pfeifer wrote:
Dear all,
we still have a few open pull requests. Almost all of them are now in conflict with the master branch. What is the best practice in this case? Merge them with master from time to time? Or wait until someone deals with them?
I am asking because of #852 and #692. They involve a series of rather important bugfixes, but could not be merged at the current point in time.
Best,
Johannes
_______________________________________________Dev mailing listDev@dynare.orghttps://www.dynare.org/cgi-bin/mailman/listinfo/dev