<div dir="ltr">Charles, Marc's advice reminded me that I left out an important step- creating a branch off of the karaf branch. His advice to squash commits into blocks before rebasing master can save you quite a bit of time, so I'd go with that approach over all others we've discussed. Best of luck!<div><br></div><div>Rachel<br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Mar 21, 2016 at 4:36 AM, Marc Savy <span dir="ltr"><<a href="mailto:marc.savy@redhat.com" target="_blank">marc.savy@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">It's right there in the archive -<br>
<br>
<a href="http://lists.jboss.org/pipermail/apiman-dev/2016-March/000090.html" rel="noreferrer" target="_blank">http://lists.jboss.org/pipermail/apiman-dev/2016-March/000090.html</a><br>
<br>
`git rebase --interactive` is the same as `git rebase -i`<br>
<div class="HOEnZb"><div class="h5"><br>
On 16/03/2016 08:52, Charles Moulliard wrote:<br>
> No advices from @Rachel or @Marc ?<br>
><br>
><br>
> On 08/03/16 14:30, Charles Moulliard wrote:<br>
>> Perhaps the option "git rebase --interactive" is better ?<br>
>><br>
>> I'm also thinking that the rebase should be done from the commits of<br>
>> karaf branch to master. If this is the case, then the cmds to be used are<br>
>><br>
>> git checkout master<br>
>> git rebase --interactive karaf // squash of the commits can be done<br>
>> within the editor<br>
>><br>
>><br>
>> On 08/03/16 12:44, Eric Wittmann wrote:<br>
>>> @Marc or @Rachel - any advice to charles on the best way to merge and<br>
>>> squash?<br>
>>><br>
>>> -Eric<br>
>>><br>
>>> On 3/8/2016 3:21 AM, Charles Moulliard wrote:<br>
>>>> On 01/03/16 13:36, Eric Wittmann wrote:<br>
>>>>> Hi Charles. Here are some things we would need before we can merge<br>
>>>>> the karaf branch:<br>
>>>>><br>
>>>>> 1) rebase the karaf branch to master<br>
>>>>> 2) squash the commits to a single commit<br>
>>>><br>
>>>> >> Can you confirm my scenario to rebase and squash ?<br>
>>>> git checkout karaf<br>
>>>> git rebase master<br>
>>>> --> Fix merge issues and commit them ?<br>
>>>> git checkout master<br>
>>>> git merge --squash<br>
>>>><br>
>>>>> 3) thorough code review<br>
>>>>> 4) testing<br>
>>>>><br>
>>>>> #1 - I think this is pretty straightforward.<br>
>>>>><br>
>>>>> #2 - Normally I wouldn't mind a small number of commits for a<br>
>>>>> contribution like the karaf support, but you've got 221 commits in the<br>
>>>>> karaf branch, representing 117 files changed or added. That's a very<br>
>>>>> large impact on the project's commit history and will make future<br>
>>>>> diffs more difficult than is warranted. So that's the reason to<br>
>>>>> squash the commits down to one (or at most a handful).<br>
>>>>><br>
>>>>> #3 - I'll need to run through the code with the rest of the apiman dev<br>
>>>>> team so we're all familiar with the changes. We need some extra<br>
>>>>> eyeballs on the code to make sure we don't (for example) duplicate a<br>
>>>>> lot of functionality.<br>
>>>>><br>
>>>>> #4 - Obviously we'll need to do some testing to make sure everything<br>
>>>>> is working as expected.<br>
>>>>><br>
>>>>> Unfortunately we've got a bunch of high priority tasks at the moment,<br>
>>>>> so it may be a little while before we can get to #3 and #4. I'm happy<br>
>>>>> to accomplish #1 and #2 at some point in the future, although if you'd<br>
>>>>> like to give it a try that would be fine too.<br>
>>>>><br>
>>>>> -Eric<br>
>>>>><br>
>>>>><br>
>>>>> On 3/1/2016 4:13 AM, Charles Moulliard wrote:<br>
>>>>>> Hi,<br>
>>>>>><br>
>>>>>> Can we consider to merge Karaf branch with Master - trunk ? What<br>
>>>>>> are the<br>
>>>>>> steps that we have to take care in order to prepare the merge ?<br>
>>>>>><br>
>>>>>> Regards,<br>
>>>>>><br>
>>>>>> Charles<br>
>>>>>> _______________________________________________<br>
>>>>>> Apiman-dev mailing list<br>
>>>>>> <a href="mailto:Apiman-dev@lists.jboss.org">Apiman-dev@lists.jboss.org</a><br>
>>>>>> <a href="https://lists.jboss.org/mailman/listinfo/apiman-dev" rel="noreferrer" target="_blank">https://lists.jboss.org/mailman/listinfo/apiman-dev</a><br>
>>>>>><br>
>>>><br>
>><br>
><br>
> _______________________________________________<br>
> Apiman-dev mailing list<br>
> <a href="mailto:Apiman-dev@lists.jboss.org">Apiman-dev@lists.jboss.org</a><br>
> <a href="https://lists.jboss.org/mailman/listinfo/apiman-dev" rel="noreferrer" target="_blank">https://lists.jboss.org/mailman/listinfo/apiman-dev</a><br>
><br>
<br>
_______________________________________________<br>
Apiman-dev mailing list<br>
<a href="mailto:Apiman-dev@lists.jboss.org">Apiman-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/apiman-dev" rel="noreferrer" target="_blank">https://lists.jboss.org/mailman/listinfo/apiman-dev</a><br>
</div></div></blockquote></div><br></div></div></div>