Github user gdfm commented on the issue:
https://github.com/apache/incubator-samoa/pull/63
Hi @mehdidb,
I'm trying to merge the PR but I get a very unclean commit history when I
rebase vs the current master:
pick dbfdc49 SAMOA-67 : Integration of MOA Instances into SAMOA
pick c3155a1 SAMOA-67 : Integration of MOA Instances into SAMOA
pick 455ae8f SAMOA-67 : Re-including hsAttributesIndices in Instances
pick 34622ab SAMOA-67 : Correction in Instances Header
pick 1c7a4c8 SAMOA-67 : Correct indentation
pick 69d2165 SAMOA-67 : Improvement in speed
pick 1f7ce52 SAMOA-67 : Improvement in speed
pick 28da2cf SAMOA-67 : Improvement in speed
pick 2ab6d4a SAMOA-67 : Corrections in AvroLoader and ArffLoader
pick f414739 SAMOA-67 : Merge new instances into new code
And it also fails the rebase.
I think it is because of these 2 commits:
commit c87fc6d74e5df85d5a36d32260c511b87685c2d2
Merge: 8275e84 dbc3aab
Author: mehdidb <[email protected]>
Date: Thu Jul 6 12:44:34 2017 +0200
Merge remote-tracking branch 'refs/remotes/apache/master'
# Conflicts:
#
samoa-instances/src/main/java/org/apache/samoa/instances/Attribute.java
#
samoa-instances/src/main/java/org/apache/samoa/instances/DenseInstance.java
#
samoa-instances/src/main/java/org/apache/samoa/instances/SingleLabelInstance.java
#
samoa-instances/src/main/java/org/apache/samoa/instances/SparseInstance.java
commit 8275e849569a5e54099434244a5bfa2085c40030
Merge: 2ab6d4a a1cc237
Author: mehdidb <[email protected]>
Date: Thu Jul 6 12:22:15 2017 +0200
Merge remote-tracking branch 'refs/remotes/apache/master'
Could you try cleaning up your commit history and pushing a cleaned up PR
with a single commit on top of the current HEAD of master?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
