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.

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

Move stock #401

Merged
merged 1 commit into from
Jan 24, 2024
Merged

Move stock #401

merged 1 commit into from
Jan 24, 2024

Conversation

DanielO
Copy link
Contributor

@DanielO DanielO commented Jan 16, 2024

Move the stock column left a few spaces so it is visible by default.

@Bouni
Copy link
Owner

Bouni commented Jan 22, 2024

Something with your branch seems to be really messed up. You include the changes from the prevous PRs in every PR again.
I was able to fix #400 but this one gives me a ton of merge conflicts. Your main branch is ages behind my main branch.
That makes rebasing hard for me as I don't want to mess up your repo ...

Can you please catch up with your main branch and create a new feature branch from that and apply your changes there?
Or somehow fix this PR if you know how (this is above my git knowledge ...)

@Bouni Bouni mentioned this pull request Jan 22, 2024
@DanielO
Copy link
Contributor Author

DanielO commented Jan 22, 2024

Sorry about that, my patches were interdependent but I guess I operated git wrong :)

@DanielO
Copy link
Contributor Author

DanielO commented Jan 22, 2024

OK, I've munged it now

@Bouni Bouni merged commit bb1e314 into Bouni:main Jan 24, 2024
2 checks passed
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