Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ignore branch merges with newlines #214

Merged
merged 2 commits into from
Dec 26, 2017

Conversation

marionebl
Copy link
Contributor

@marionebl marionebl merged commit 52514d6 into master Dec 26, 2017
@marionebl marionebl deleted the fix-ignore-branch-merges-with-newlines branch December 26, 2017 18:48
marionebl added a commit that referenced this pull request Jan 9, 2018
* fix: ignore branch merges with newlines

* fix: remove stray console.log
@dabit1gamma
Copy link

dabit1gamma commented Oct 4, 2018

Hi! I'm sorry to say that It is not working properly. In this case, for example, it is not working:

Merge branch 'master' of https://github.com/xxx/xxx
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 1 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   config/locale/en.po
#	modified:   config/locale/es.po
#	modified:   config/locale/messages.pot
#

`

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

Successfully merging this pull request may close these issues.

Commit messages in the format "Merge branch ..." fail linting
2 participants