Hi Adam, On Thu, Jun 13, 2013 at 11:21:42AM +0300, Adam Fyne <[email protected]> wrote: > I've never done such an operation as 'rebasing' against newer master. > Does this require me to do 'git pull' ?
A 'git pull -r', yes. If there are conflicts, you'll need to resolve those during 'git pull -r'. > Will I have to build all the project? You will need to run a toplevel 'make'. That doesn't necessaryly mean a full build, depends on how old your local master is. Miklos
signature.asc
Description: Digital signature
_______________________________________________ LibreOffice mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice
