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.

Sign up for GitHub

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

Jump to bottom

Suggestion: Check for merge conflicts #36

Open
ajgon opened this issue Dec 14, 2015 · 1 comment
Open

Suggestion: Check for merge conflicts #36

ajgon opened this issue Dec 14, 2015 · 1 comment
Assignees
@agwozdowski
Labels
enhancement

Comments

@ajgon
Copy link

ajgon commented Dec 14, 2015

Sometimes, those pesky <<<<< can slip in a less expected way :). Example check:

files.select { |f| File.read(f).match(/^<<<<<<<[ \t]/)
@agwozdowski
Copy link
Contributor

Good idea, I'll implement this.

@agwozdowski agwozdowski self-assigned this Dec 14, 2015
agwozdowski added a commit that referenced this issue Jan 23, 2016
@agwozdowski
Git conflicts validator, Fixes #36
2cfc8be
agwozdowski added a commit that referenced this issue Feb 7, 2016
@agwozdowski
Git conflicts validator, Fixes #36
4e45b41
agwozdowski added a commit that referenced this issue Mar 5, 2016
@agwozdowski
Git conflicts validator, Fixes #36
50e6a34
agwozdowski added a commit that referenced this issue Mar 5, 2016
@agwozdowski
Git conflicts validator, Fixes #36
472ee21
agwozdowski added a commit that referenced this issue Mar 9, 2016
@agwozdowski
Git conflicts validator, Fixes #36
fe135df
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@agwozdowski agwozdowski

Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@ajgon @nijikon @agwozdowski