Hi! That's a great news, Carlos!
2013/5/22 Carlos López González <[email protected]>: > 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. Rebase operation isn't related to the fact if branches belong to the same repository or not. As the note for the future, the steps to rebase cairo_pending branch: git checkout cairo_pending git rebase master # the cairo pending is starts at master now # We can't send pull request, because we are in the same repo. But we can do a plain merge instead: git checkout master git merge cairo_pending # Fast-forward merge will happen, because cairo_pending starts from master! # Push the changes: git push origin master git push -f origin cairo_pending That's it. ^__^ You can fix the current situation and undo your merge with the following commands: # undo changes git checkout master git reset --hard 4b1dad7d051b43cb0c0c4bee80252dff9ca4e4e9 # reset to "bones_merge" branch # do the rebase operations properly (described above) git checkout cairo_pending git rebase master git checkout master git merge cairo_pending # launch gitk and carefully review if everything is fine ^___^ # then push changes: git push -f origin master git push -f origin cairo_pending Cheers! K. -- http://morevnaproject.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
