You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2024/11/17 21:05:14 UTC
(airflow) branch main updated: Fix missing end of block in Airflow 3 DEV readme (#44120)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 2cc9b5865ba Fix missing end of block in Airflow 3 DEV readme (#44120)
2cc9b5865ba is described below
commit 2cc9b5865ba9d0d05c73fe01178fc641cffb438e
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Nov 17 21:05:07 2024 +0000
Fix missing end of block in Airflow 3 DEV readme (#44120)
Follow up after #44118
---
dev/README_AIRFLOW3_DEV.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dev/README_AIRFLOW3_DEV.md b/dev/README_AIRFLOW3_DEV.md
index 5acf8016b95..2db87b4b059 100644
--- a/dev/README_AIRFLOW3_DEV.md
+++ b/dev/README_AIRFLOW3_DEV.md
@@ -182,6 +182,8 @@ To set GH_AUTH run this:
```bash
export GH_AUTH={token}
+```
+
Sometimes it might result with conflict. In such case, you should manually resolve the conflicts.
Some IDEs like IntelliJ has a fantastic conflict resolution tool - just follow `Git -> Resolve conflicts`
menu after you get the conflict. But you can also resolve the conflicts manually (git adds `<<<<<<<`, `=======` and