El 10/12/17 a las 00:52, Adolfo Jayme Barrientos escribió:
2017-12-09 8:07 GMT-06:00 Ricardo Palomares Martínez
<rpmdisguise-java@yahoo.es>:
As usual, I've forgotten to rebase my local copy of the repository
until I've tried to push the changes and got the error message. In
order to update our wiki, which is the right moment to run git rebase?
Would it be best to run it right after pulling the changes from the
master repository and before committing the new changes, or just
before trying to push upstream?
I’d say the former. That way, you minimize the risk of conflicts.
Thank you so much, I've updated our wiki. I've also put a note to
myself to not forget to update description.xml, which I see you have
had to update by hand in Gerrit, sorry. :-)
Thanks again for all your help, as always.
--
Ricardo Palomares (RickieES)
https://github.com/RickieES
https://sourceforge.net/u/rpalomares/profile
http://stackoverflow.com/users/1185157/
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.