[Apiman-dev] Merge Karaf branch to Master

[Charles Moulliard]

Perhaps the option "git rebase --interactive" is better ?

I'm also thinking that the rebase should be done from the commits of 
karaf branch to master. If this is the case, then the cmds to be used are

git checkout master
git rebase --interactive karaf // squash of the commits can be done 
within the editor


On 08/03/16 12:44, Eric Wittmann wrote:
> @Marc or @Rachel - any advice to charles on the best way to merge and 
> squash?
>
> -Eric
>
> On 3/8/2016 3:21 AM, Charles Moulliard wrote:
>> On 01/03/16 13:36, Eric Wittmann wrote:
>>> Hi Charles.  Here are some things we would need before we can merge
>>> the karaf branch:
>>>
>>> 1) rebase the karaf branch to master
>>> 2) squash the commits to a single commit
>>
>>  >> Can you confirm my scenario to rebase and squash ?
>> git checkout karaf
>> git rebase master
>> --> Fix merge issues and commit them ?
>> git checkout master
>> git merge --squash
>>
>>> 3) thorough code review
>>> 4) testing
>>>
>>> #1 - I think this is pretty straightforward.
>>>
>>> #2 - Normally I wouldn't mind a small number of commits for a
>>> contribution like the karaf support, but you've got 221 commits in the
>>> karaf branch, representing 117 files changed or added.  That's a very
>>> large impact on the project's commit history and will make future
>>> diffs more difficult than is warranted.  So that's the reason to
>>> squash the commits down to one (or at most a handful).
>>>
>>> #3 - I'll need to run through the code with the rest of the apiman dev
>>> team so we're all familiar with the changes.  We need some extra
>>> eyeballs on the code to make sure we don't (for example) duplicate a
>>> lot of functionality.
>>>
>>> #4 - Obviously we'll need to do some testing to make sure everything
>>> is working as expected.
>>>
>>> Unfortunately we've got a bunch of high priority tasks at the moment,
>>> so it may be a little while before we can get to #3 and #4. I'm happy
>>> to accomplish #1 and #2 at some point in the future, although if you'd
>>> like to give it a try that would be fine too.
>>>
>>> -Eric
>>>
>>>
>>> On 3/1/2016 4:13 AM, Charles Moulliard wrote:
>>>> Hi,
>>>>
>>>> Can we consider to merge Karaf branch with Master - trunk ? What 
>>>> are the
>>>> steps that we have to take care in order to prepare the merge ?
>>>>
>>>> Regards,
>>>>
>>>> Charles
>>>> _______________________________________________
>>>> Apiman-dev mailing list
>>>> Apiman-dev at lists.jboss.org
>>>> https://lists.jboss.org/mailman/listinfo/apiman-dev
>>>>
>>