Hi!
I've recently updated the master branch including the bones branch changes
and the cairo pending things to complete the roadmap for 0.64.1
Please update your development branches by rebasing the master branch.
Bones changes are huge and comes from long time ago branch, so it is
possible that rebase might fail. Please do an interactive rebasing or a
merge commit of master on your branch in that case.
I have made some tests with your current development branches and in most
of cases the rebase is possible in one step. In jcome branches some
conflicts have been raised but using interactive rebasing it is possible to
resolve the conflicts and complete the rebasing.
I apologize for not apply that recommendations to my own branch
(cairo_pending) but I wasn't able to rebase it properly since it was pushed
to the same repository than bones and so, I don't know how to rebase it.
If someone has problems rebasing, please let me know and I'll rebase the
requested branch into synfig repository, so the branch can be fetched and
reseted in your repository.
I hope I have learned enough about git, to avoid to do more merge commits
in the future when possible.
Thanks!
--
Carlos
http://synfig.org
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
