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

Modified so that vbf templates can be generated #31

Closed
wants to merge 1,252 commits into from
Closed

Conversation

andresnava1000
Copy link
Collaborator

No description provided.

@rkansal47
Copy link
Owner

@andresnava1000 could you take a look at the comment ^, and then I can merge this.

andresnava1000 and others added 3 commits November 7, 2023 23:16
…to vbf_template

Conflicts:
	src/HHbbVV/postprocessing/postprocessing.py
	src/HHbbVV/postprocessing/utils.py
@rkansal47
Copy link
Owner

ok @andresnava1000 sorry there's something crazy going on with this PR (1000+ commits??) - could you just make a new branch from main and copy over your changes to the hh_vars.py and postprocessing.py scripts?

@rkansal47
Copy link
Owner

oh or actually, can you try doing git pull origin main --rebase first inside this branch - maybe that will fix it...

@andresnava1000
Copy link
Collaborator Author

@rkansal47 I was getting some weird issues with git when trying to use rebase so I tried using "git rebase origin/main vbf_template" instead but then I got a lot of conflict issues. I made a new branch instead which has all of the same edits.

@rkansal47
Copy link
Owner

ok should I close this pull request without merging then?

@rkansal47 rkansal47 closed this Nov 17, 2023
@rkansal47 rkansal47 deleted the vbf_template branch January 11, 2024 21:29
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.

4 participants