Skip to content
This repository has been archived by the owner on Sep 6, 2018. It is now read-only.

List BitCloud (BTDX) #29

Merged
merged 1 commit into from
Jun 27, 2018
Merged

Conversation

dalijolijo
Copy link
Contributor

@blabno
Copy link

blabno commented Jun 22, 2018

Applied Bisq codestyle. Please squash those commits.

Copy link
Contributor Author

@dalijolijo dalijolijo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How can I squash the two commits in an easy way? Or do I have to create a new PullRequest?

@dalijolijo dalijolijo force-pushed the list-bitcloud-asset branch from 4b19213 to 44f04cd Compare June 25, 2018 12:52
@blabno
Copy link

blabno commented Jun 26, 2018

git rebase -i HEAD^^
Then in the editor you change pick to fixup on the commits you want to merge with upper commit.

@dalijolijo dalijolijo force-pushed the list-bitcloud-asset branch from 7f99f49 to 72084bb Compare June 26, 2018 08:46
@dalijolijo
Copy link
Contributor Author

squash commits done

@cbeams
Copy link
Contributor

cbeams commented Jun 26, 2018

Hey @blabno, just a heads up that there's no need to have submitters squash commits if the only "extra commits" in question are review commits, e.g. the one here in which you applied Bisq's code style. It's actually useful to preserve such commits because it teaches others what the style deviation was.

What's not useful is having N partial commits that put together the original pull request. We always those three changes (Asset implementation, test and registration) to be atomic, and thus squashed if necessary. Thanks.

@dalijolijo
Copy link
Contributor Author

What should I do now?

Copy link
Contributor

@cbeams cbeams left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@cbeams cbeams merged commit 0a68a1d into bisq-network:master Jun 27, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants