Skip to content

Conversation

Data-Meister
Copy link
Contributor

@sukima
Copy link
Contributor

sukima commented Jan 21, 2016

These three commits can be squashed into one. No need to save the intermediate work in progress with the final merge.

git reset master
git add .
git commit -C 83f146e

Or you can do an interactive rebase git rebase -i.

@Data-Meister
Copy link
Contributor Author

I edited with the github online editor. Know how to do this with github?

@lolmaus
Copy link
Contributor

lolmaus commented Jan 22, 2016

You can't squash with GitHub web interface. You need to clone your fork repo, checkout your branch and use git rebase -i HEAD~3 or something like that. Google up squashing.

PS I personally don't mind merging with multiple commits, but apparently this repo has standards.

@sukima
Copy link
Contributor

sukima commented Jan 22, 2016

I avoid the GitHub interface except for very small changes. Since the whole concept is to use Git the idea of not using Git is strange and weird to me.

As maintainer of my own projects I usually will volunteer to do the squash myself during the merge. So I volunteer to do that here as well But that would mean closing this PR and opening another one. If the rebase were to happen on Data-Meister:master branch instead then this PR would autoupdate.

@lolmaus
Copy link
Contributor

lolmaus commented Jan 22, 2016

@sukima If @Data-Meister gives you edit access to his fork repo, you'll be able to force-push while staying in this PR.

@sukima
Copy link
Contributor

sukima commented Jan 22, 2016

@lolmaus
Copy link
Contributor

lolmaus commented Jan 22, 2016

Repo Collaborator merge squash

http://i.imgur.com/DlPmhOb.jpg
Whoa...

@sukima
Copy link
Contributor

sukima commented Jan 22, 2016

@lolmaus you ok with a Repo Collaborator merge squash? Means this PR will marked as closed not merged.

Also,

@lolmaus
Copy link
Contributor

lolmaus commented Jan 22, 2016

@sukima Yes, if @Data-Meister retains his credit for the commit.

@sukima
Copy link
Contributor

sukima commented Jan 22, 2016

@lolmaus yes the author does not change only the committer.

Copy link
Contributor

Choose a reason for hiding this comment

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

Would prefer this without brackets:

re = new RegExp subStr ,"g"

sukima added a commit that referenced this pull request Jan 22, 2016
Closes PR #137

This was a squashed rebase of the following:

commit 721deae
Author: Data-Meister <fred.fisher.dev@gmail.com>
Date:   Thu Jan 21 18:02:57 2016 +0000

    remove todo

commit f56cd11
Author: Data-Meister <fred.fisher.dev@gmail.com>
Date:   Thu Jan 21 18:02:13 2016 +0000

    Fix indentation

commit 83f146e
Author: Data-Meister <fred.fisher.dev@gmail.com>
Date:   Thu Jan 21 18:01:17 2016 +0000

    Add a recipe to count occurrences of a given string within a message
@sukima
Copy link
Contributor

sukima commented Jan 22, 2016

Closed by commit 9d67a39

@sukima sukima closed this Jan 22, 2016
@sukima
Copy link
Contributor

sukima commented Jan 22, 2016

@lolmaus Darn, missed that comment. I don't want to force push to master because I don't know who has pulled since the merge (2 minutes ago). Perhaps another PR?

@lolmaus
Copy link
Contributor

lolmaus commented Jan 22, 2016

I think it's too minor to bother.

@Data-Meister and @sukima, thank you for contributing!

@Data-Meister
Copy link
Contributor Author

You're most welcome @lolmaus and thank you @sukima, I'm new to GitHub and will bear this best-practice in mind for the future.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants