You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "dstandish (via GitHub)" <gi...@apache.org> on 2025/04/22 16:28:43 UTC
[PR] Remove merge conflict symbols from the airflow codebase [airflow]
dstandish opened a new pull request, #49564:
URL: https://github.com/apache/airflow/pull/49564
Having these in the codebase results in false positives every time you search for merge conflicts in the code. And that's annoying.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Remove merge conflict symbols from the airflow codebase [airflow]
Posted by "dstandish (via GitHub)" <gi...@apache.org>.
dstandish commented on PR #49564:
URL: https://github.com/apache/airflow/pull/49564#issuecomment-2824707990
> Fine for me. Though not affected. PyCharm /IntelliJ has fantastic conflict resolution tooling that handles conflict resolution really nicely.
I guess I'm old fashioned and never really liked using GUI tools for conflict resolution -- even though they were around since before I started doing dev work 🤷
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Remove merge conflict symbols from the airflow codebase [airflow]
Posted by "kaxil (via GitHub)" <gi...@apache.org>.
kaxil commented on PR #49564:
URL: https://github.com/apache/airflow/pull/49564#issuecomment-2824879270
> > Fine for me. Though not affected. PyCharm /IntelliJ has fantastic conflict resolution tooling that handles conflict resolution really nicely.
>
> I guess I'm old fashioned and never really liked using GUI tools for conflict resolution -- even though they were around since before I started doing dev work 🤷
Oh yeah Pycharm one is probably the best I have seen
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Remove merge conflict symbols from the airflow codebase [airflow]
Posted by "dstandish (via GitHub)" <gi...@apache.org>.
dstandish commented on PR #49564:
URL: https://github.com/apache/airflow/pull/49564#issuecomment-2821908383
> git diff --check
When I'm resolving conflicts i go to pycharm and do "find in files" and search for `<<<<<<` and then just resolve them manually. terminal is for cavemen.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Remove merge conflict symbols from the airflow codebase [airflow]
Posted by "dstandish (via GitHub)" <gi...@apache.org>.
dstandish merged PR #49564:
URL: https://github.com/apache/airflow/pull/49564
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Remove merge conflict symbols from the airflow codebase [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on PR #49564:
URL: https://github.com/apache/airflow/pull/49564#issuecomment-2824070131
Fine for me. Though not affected. PyCharm /IntelliJ has fantastic conflict resolution tooling that handles conflict resolution really nicely.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org