<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body smarttemplateinserted="true" bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">On 12/26/2016 11:16 PM, Tor Lillqvist wrote:<br>
</div>
<blockquote cite="mid:CANGFS+9p_WHN8cosu2w-d4LqmchEnZenXa2ss22ANmjPfu6Vog@mail.gmail.com" type="cite">
<div dir="ltr"><br>
<div class="gmail_extra">
<div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr">
<div>Earlier the master used to build successfully and I always create a separate branch for patches and don't make changes on Branch master itself.</div>
<div><br>
</div>
</div>
</blockquote>
<div>Unless you are an experienced developer who is working on a specific feature where your work in progress will interfere with how LibreOffice works for others, it is really not useful to use a branch. In my opinion. If you use a branch, you will miss build
fixes others have committed to master. For instance for this very problem (that others have seen, too), and that might be fixed in master already.</div>
</div>
</div>
</div>
</blockquote>
<br>
I suppose that using local branches is very convenient and correct way. If you only work with one patch at a time, you may use master; but when you are working on several (like e.g. one patch is being polished in gerrit, while another is in progress)<span class="st4cursor"></span>,
then using master becomes messy.<br>
<br>
I use a commant like this:<br>
git checkout master && ./g pull -r && for branch in $(git branch | cut -c 3-) ; do if [ $branch != "master" ] ; then git rebase master $branch ; fi ; done && git checkout <A-CHOSEN-BRANCH-NAME-HERE> && make<br>
to keep all branches up-to-date (I must say that I keep branches/tags like libreoffice-5-3 etc. on a different repo). Doing so allows me avoid huge recompilations each time I checkout a different branch, because they are based on same baseline, and differ
only by their specific commits (so building one makes all other ready for quick incremental build).<br>
<br>
<div class="moz-signature">-- <br>
Best regards,<br>
Mike Kaganski</div>
</body>
</html>