Skip to content

Adding project MiniPTI to README#2577

Merged
dependabot[bot] merged 0 commit intodependabot/pip/doc/pydata-sphinx-theme-0.12.0from
master
Jan 30, 2023
Merged

Adding project MiniPTI to README#2577
dependabot[bot] merged 0 commit intodependabot/pip/doc/pydata-sphinx-theme-0.12.0from
master

Conversation

@bilaljo
Copy link
Copy Markdown

@bilaljo bilaljo commented Jan 7, 2023

README.md

I'm using PyQtGraph for my GUI in the project MiniPTI on GitHub (as part from the EU project Passepartout) and would like to add it to the list of "who uses the library".

https://github.com/bilaljo/MiniPTI

@j9ac9k
Copy link
Copy Markdown
Member

j9ac9k commented Jan 7, 2023

Hi @bilaljo

Thanks for the PR!

Looks like something got messed up in the git commit histories you're attempting to merge, and 33 commits are trying to merged in with changes to 17 files... Can you update the source branch to clean up the git commit history/sync issues? Also, not a deal breaker, but probably would be good to have a screenshot of the GUI on the README (nice to see what pyqtgraph looks like in your tool) ...but again not necessary.

@j9ac9k
Copy link
Copy Markdown
Member

j9ac9k commented Jan 15, 2023

Hi @bilaljo

I think the source and target branches are still wrong, it shows up as you trying to merge into a dependabot branch instead of master...let me know if you need help sorting out the git confusion.

@bilaljo
Copy link
Copy Markdown
Author

bilaljo commented Jan 16, 2023

Hi @j9ac9k
thank you for your reply. Great idea, I'll add a picture of it (I have to do some refactoring before it's ready, but it is on my to-do list).

I think I need help, probably I choose the wrong branch. How can I fix it?

@j9ac9k
Copy link
Copy Markdown
Member

j9ac9k commented Jan 20, 2023

I think I need help, probably I choose the wrong branch. How can I fix it?

You have a couple of things going on, on your PR you are trying to merge from master

image

See the branch names, I think if you press the edit button, you can change it so that it goes from bilaljo/your-branch -> pyqtgraph/master. (substitute "your-branch" with whatever git branch you committed the change to README.md on in your fork).

I would start with that and see how github resolves this PR then.

@bilaljo
Copy link
Copy Markdown
Author

bilaljo commented Jan 20, 2023

Ah okay, now I understand. I actually cannot find it. May I close it and create another request? Intwo which branch should I commit in this case than?

@dependabot dependabot bot merged commit 476f466 into dependabot/pip/doc/pydata-sphinx-theme-0.12.0 Jan 30, 2023
@dependabot dependabot bot force-pushed the dependabot/pip/doc/pydata-sphinx-theme-0.12.0 branch from 4c43b44 to ac0461b Compare January 30, 2023 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants