From 737d37444bd4cb23120aa3375e62a990f0417ed5 Mon Sep 17 00:00:00 2001
From: Rodrigo Gonzalez <r@rodrigo-gonzalez.com>
Date: Sat, 19 Aug 2023 22:18:58 -0400
Subject: [PATCH] =?UTF-8?q?bump:=20version=200.10.1=20=E2=86=92=200.11.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                               | 6 ++++++
 Makefile                                   | 2 +-
 pyproject.toml                             | 4 ++--
 src/flake8_custom_import_rules/__init__.py | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29d6b76..48c9063 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v0.11.0 (2023-08-19)
+
+### Feat
+
+- **flake8-plugin**: add check for rule conflicts (#160)
+
 ## v0.10.1 (2023-08-19)
 
 ### Fix
diff --git a/Makefile b/Makefile
index a2eaf0d..7b407f1 100644
--- a/Makefile
+++ b/Makefile
@@ -201,7 +201,7 @@ new-branch: check-branch-name  ## Create a new branch
 new-feat-branch: check-branch-name  ## Create a new feature branch
 	git checkout -b feat/$(BRANCH)_$(commit_count)
 
-new-version-branch: check-branch-name  ## Create a new version branch
+new-version-branch:  ## Create a new version branch
 	NEW_VERSION=$(shell poetry run cz bump --dry-run | grep 'bump: version' | awk -F ' ' '{print $$NF}'); \
 	git checkout -b bump/v$$NEW_VERSION
 
diff --git a/pyproject.toml b/pyproject.toml
index 0cb323a..9df4acd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "flake8_custom_import_rules"
-version = "0.10.1"
+version = "0.11.0"
 description = "A Flake8 plugin that enforces custom import rules, allowing users to define and maintain clean and consistent import organization across their Python projects."
 readme = "README.rst"
 authors = ["Rodrigo Gonzalez <flake8.custom.import.rules@gmail.com>"]
@@ -96,7 +96,7 @@ mkdocstrings = {extras = ["optimize", "python"], version = "^0.22.0"}
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.10.1"
+version = "0.11.0"
 tag_format = "v$version"
 version_type = "semver"
 update_changelog_on_bump = true
diff --git a/src/flake8_custom_import_rules/__init__.py b/src/flake8_custom_import_rules/__init__.py
index e7d8ef1..2cabfa2 100644
--- a/src/flake8_custom_import_rules/__init__.py
+++ b/src/flake8_custom_import_rules/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.10.1"
+__version__ = "0.11.0"
 
 
 def show_versions() -> None: