[prev in list] [next in list] [prev in thread] [next in thread]
List: opennms-discuss
Subject: Re: [opennms-discuss] OpenNMS pre-compiled out-of-the-box MIB event files
From: Seth Leger <seth () opennms ! org>
Date: 2016-01-19 16:42:25
Message-ID: 569E6771.5040001 () opennms ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
I think that would work because you're basically saying "rewind by 4
commits, then commit all of the changes that are left sitting in my
sandbox as 1 commit". However, we should avoid this situation by
reviewing PRs before they get into our repo in the first place. git push
--force will cause problems to anyone else working on the same branch so
it's not a perfect solution (even though it's likely that branches like
this would have a single author).
-- Seth
On 1/18/16 10:59 AM, David S Hustace wrote:
>
>> On Jan 13, 2016, at 11:08 AM, Seth Leger <seth@opennms.org
>> <mailto:seth@opennms.org>> wrote:
>>
>> If you do a squash merge, it will only commit the delta of changes on
>> the branch instead of every commit along the branch, so the repo
>> would only grow by 4MB instead of 20MB+.
>
> We should probably do something about cleaning up these in the repo so
> that we can reduce the pull lag. I’ve read we could do something like:
>
> |git checkout my_branch git reset --soft HEAD~4 git commit git push
> --force origin my_branch|
>
> :David
> (git illiterate)
>
>
> ------------------------------------------------------------------------------
> Site24x7 APM Insight: Get Deep Visibility into Application Performance
> APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
> Monitor end-to-end web transactions and take corrective actions now
> Troubleshoot faster and improve end-user experience. Signup Now!
> http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
>
>
> _______________________________________________
> Please read the OpenNMS Mailing List FAQ:
> http://www.opennms.org/index.php/Mailing_List_FAQ
>
> opennms-discuss mailing list
>
> To *unsubscribe* or change your subscription options, see the bottom of this page:
> https://lists.sourceforge.net/lists/listinfo/opennms-discuss
[Attachment #5 (text/html)]
<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">I think that would work because you're
basically saying "rewind by 4 commits, then commit all of the
changes that are left sitting in my sandbox as 1 commit". However,
we should avoid this situation by reviewing PRs before they get
into our repo in the first place. git push --force will cause
problems to anyone else working on the same branch so it's not a
perfect solution (even though it's likely that branches like this
would have a single author).<br>
<br>
-- Seth<br>
<br>
<br>
On 1/18/16 10:59 AM, David S Hustace wrote:<br>
</div>
<blockquote
cite="mid:E658D550-AFCA-4019-AFAE-17C4BF3EC222@opennms.com"
type="cite">
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252">
<div class=""><br class="">
<div>
<blockquote type="cite" class="">
<div class="">On Jan 13, 2016, at 11:08 AM, Seth Leger <<a
moz-do-not-send="true" href="mailto:seth@opennms.org"
class=""><a class="moz-txt-link-abbreviated" \
href="mailto:seth@opennms.org">seth@opennms.org</a></a>> wrote:</div> <div \
class=""> <div bgcolor="#FFFFFF" text="#000000" class="">
<div class="moz-cite-prefix"><br class="">
If you do a squash merge, it will only commit the
delta of changes on the branch instead of every commit
along the branch, so the repo would only grow by 4MB
instead of 20MB+.<br class="">
</div>
</div>
</div>
</blockquote>
<div><br class="">
</div>
<div>We should probably do something about cleaning up these
in the repo so that we can reduce the pull lag. I’ve read
we could do something like:</div>
<div><br class="">
</div>
<div>
<pre style="margin-top: 0px; padding: 5px; border: 0px; font-size: 13px; \
overflow: auto; width: auto; max-height: 600px; background-color: rgb(238, 238, 238); \
font-family: Consolas, Menlo, Monaco, 'Lucida Console', 'Liberation Mono', 'DejaVu \
Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', monospace, sans-serif; \
word-wrap: normal; color: rgb(34, 36, 38);" class=""><code style="margin: 0px; \
padding: 0px; border: 0px; font-family: Consolas, Menlo, Monaco, 'Lucida Console', \
'Liberation Mono', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', \
monospace, sans-serif; white-space: inherit;" class="">git checkout my_branch git \
reset --soft HEAD~4 git commit
git push --force origin my_branch</code></pre>
<div class=""><br class="">
</div>
<div class="">:David</div>
<div class="">(git illiterate)</div>
</div>
</div>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
<a class="moz-txt-link-freetext" \
href="http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140">http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140</a></pre>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
Please read the OpenNMS Mailing List FAQ:
<a class="moz-txt-link-freetext" \
href="http://www.opennms.org/index.php/Mailing_List_FAQ">http://www.opennms.org/index.php/Mailing_List_FAQ</a>
opennms-discuss mailing list
To *unsubscribe* or change your subscription options, see the bottom of this page:
<a class="moz-txt-link-freetext" \
href="https://lists.sourceforge.net/lists/listinfo/opennms-discuss">https://lists.sourceforge.net/lists/listinfo/opennms-discuss</a></pre>
</blockquote>
<br>
</body>
</html>
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Please read the OpenNMS Mailing List FAQ:
http://www.opennms.org/index.php/Mailing_List_FAQ
opennms-discuss mailing list
To *unsubscribe* or change your subscription options, see the bottom of this page:
https://lists.sourceforge.net/lists/listinfo/opennms-discuss
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic