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

add a and b to origin_axis #109

Closed
wants to merge 23 commits into from
Closed

add a and b to origin_axis #109

wants to merge 23 commits into from

Conversation

paukstelis
Copy link
Contributor

Adds A and B axes for individual origin and as part of ALL.
Fixes/improves message response.

@synman
Copy link
Owner

synman commented Jan 8, 2023

are you reusing the same branch as the last PR? It's best to delete the branch used in a PR and always start fresh with a synced new branch when starting a new one. I'm not sure how git will like trying to do a merge with previously squashed commits returning.

@paukstelis
Copy link
Contributor Author

ahh...i did sync, but did not delete first. I am not all that well versed in git usage.

@synman
Copy link
Owner

synman commented Jan 8, 2023

perhaps you can merge this branch into your local DEVEL branch in your fork. verify all the stuff you want is there then you can close this PR and nuke the branch.

Then when you think you are 100% ready to deliver, initiate a PR with a new feature branch of your choosing. This is the way :)

@paukstelis paukstelis closed this Jan 9, 2023
@paukstelis
Copy link
Contributor Author

Seems like there is some complications because of how I initiated the fork. devel is my default branch, which I can't delete. I can rename it, but I am not sure that will get me where I want to go. I might just have to wipe and re-fork.

@paukstelis paukstelis deleted the devel branch January 9, 2023 00:52
@synman
Copy link
Owner

synman commented Jan 9, 2023

Okay, that actually makes sense. You were working directly in DEVEL and doing a PR from it. I did a traditional PR the other day while testing out a VS Code Pull Request / Issues extension. This is a great example of how a PR should come in:

#106

Notice how it comes from a feature branch (in this case named after the issue it was fixing (issue103/)

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