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

Update orca_output.py #67

Merged
merged 3 commits into from
Oct 30, 2024
Merged

Update orca_output.py #67

merged 3 commits into from
Oct 30, 2024

Conversation

oliviaaten
Copy link
Contributor

update docstrings

@oliviaaten oliviaaten marked this pull request as draft October 30, 2024 10:11
@oliviaaten oliviaaten force-pushed the test branch 2 times, most recently from 181a812 to fc04be4 Compare October 30, 2024 11:41
@m-julian m-julian marked this pull request as ready for review October 30, 2024 14:42
@m-julian m-julian merged commit 2beb465 into main Oct 30, 2024
3 checks passed
@m-julian
Copy link
Contributor

@oliviaaten Seems like everything works, but be very careful with using --force. You've deleted the very last commit from the main branch by doing the force push from fc04be4 (which was the latest commit on the main branch) to 0bc8056. This has changed the history of the commits (i.e. that fc04be4 is gone from the commit history of the main branch). As you can see below, the current commit on the main branch is 0bc8056. On the test branch, you still have that fc04be4 commit though because you've created that test branch beforehand. Then you've basically updated the orca_output.py file in that test branch, but you now also have that fc04be4 commit (which is a commit that I did, that's why it is show up that I contributed to this PR) that you are trying to merge from the test branch into the main branch.

I'll merge it now, but again be very careful with --force, especially when you are working with multiple people on the same code base. In the vast majority of the times, you do not need to use it.

image

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