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

Jevp Histogram Sync to reflect production code #292

Merged
merged 15 commits into from
Feb 3, 2022

Conversation

jml985
Copy link
Contributor

@jml985 jml985 commented Feb 1, 2022

Please do not review quite yet. I will be inserting files one at a time to check if they pass the tests

@jml985
Copy link
Contributor Author

jml985 commented Feb 3, 2022

@plexoos - I see you fixed the typo I made in the last commit. Great that is fully understood, but here is exactly the point where my understanding of git breaks. How do I get your change to my pull request to be reflected in my version of the JML-FEB01 branch? Obviously here it doesn't matter as I could easily make the changes myself, but say you made a hundred changes there must be a way to simply accept them and continue to use them without building in conflicts. The PR isn't yet merged with main, but at the same time it is now different from the PR I personally have made, and which I have in both my working directories and also my github branch.

@plexoos
Copy link
Member

plexoos commented Feb 3, 2022

Jeff, my fix in this commit e2202e3 is on your jml985:JML-FEB01 branch already. I was able to commit directly to your branch because of this GitHub feature. This is the default behavior unless you unset the check box "Allow edits from maintainers" when you create a PR.

This PR and therefore your branch jml985:JML-FEB01 is indeed not yet merged into main. You can continue adding changes to this remote branch without conflict when you pull my change from this remote branch into your local branch. The following should do it:

git checkout JML-FEB01
git pull

At this point you can continue to grow the branch as you like and push the changes from the local JML-FEB01 branch to the remote one as usual.

@jml985
Copy link
Contributor Author

jml985 commented Feb 3, 2022

@plexoos - Thank you for the explanation! This PR is now consistent with the running Jevp code.

@starsdong
Copy link
Member

Thanks, Jeff. After the CI builds are checked out, I think we should be able to merge.

Just to be sure, the old requests
#230
#231
#277
are now all obsolete. We should be able to close them?

@jml985 jml985 merged commit fb71ba1 into star-bnl:main Feb 3, 2022
@jml985
Copy link
Contributor Author

jml985 commented Feb 3, 2022

@starsdong Yes.

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.

None yet

4 participants