<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
On 01/03/16 13:36, Eric Wittmann wrote:<br>
<blockquote cite="mid:56D58CE5.4070808@redhat.com" type="cite">Hi
Charles. Here are some things we would need before we can merge
the karaf branch:
<br>
<br>
1) rebase the karaf branch to master<br>
</blockquote>
<blockquote cite="mid:56D58CE5.4070808@redhat.com" type="cite">2)
squash the commits to a single commit
<br>
</blockquote>
<br>
>> Can you confirm my scenario to rebase and squash ?<br>
git checkout karaf<br>
git rebase master<br>
<meta charset="utf-8">
--> Fix merge issues and commit them ?<br>
git checkout master<br>
<meta charset="utf-8">
git merge --squash <br>
<br>
<blockquote cite="mid:56D58CE5.4070808@redhat.com" type="cite">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
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).
<br>
<br>
#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.
<br>
<br>
#4 - Obviously we'll need to do some testing to make sure
everything is working as expected.
<br>
<br>
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.
<br>
<br>
-Eric
<br>
<br>
<br>
On 3/1/2016 4:13 AM, Charles Moulliard wrote:
<br>
<blockquote type="cite">Hi,
<br>
<br>
Can we consider to merge Karaf branch with Master - trunk ? What
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 class="moz-txt-link-abbreviated" href="mailto:Apiman-dev@lists.jboss.org">Apiman-dev@lists.jboss.org</a>
<br>
<a class="moz-txt-link-freetext" href="https://lists.jboss.org/mailman/listinfo/apiman-dev">https://lists.jboss.org/mailman/listinfo/apiman-dev</a>
<br>
<br>
</blockquote>
</blockquote>
<br>
</body>
</html>