[
https://issues.apache.org/jira/browse/GOSSIP-62?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16062349#comment-16062349
]
ASF GitHub Bot commented on GOSSIP-62:
--------------------------------------
Github user makrusak commented on the issue:
https://github.com/apache/incubator-gossip/pull/53
You can force push here anything.
For example:
1. Pull latest master version of incubator-gossip
2. git checkout -b GOSSIP-62-final
3. git merge --squash (all and only your new commits)
4. There will be conflicts with CrdtModule and CrdtModule for example.
Repair them and commit.
5. Then push: git push terry-remote GOSSIP-62 --force
It should lead to one clean commit in this PR without merge conflicts.
Good luck :)
> Implement Crdt PN-Counter
> -------------------------
>
> Key: GOSSIP-62
> URL: https://issues.apache.org/jira/browse/GOSSIP-62
> Project: Gossip
> Issue Type: New Feature
> Reporter: Edward Capriolo
> Assignee: Terry Weymouth
>
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
