search

LLNL / H5Z-ZFP

A registered ZFP compression plugin for HDF5
Other
50 stars 22 forks source link

Help with recent update #113

Closed markcmiller86 closed 1 year ago

markcmiller86 commented 1 year ago

@brtnfld I am completely perplexed by something I've done here...

https://github.com/LLNL/H5Z-ZFP/commit/a10bd7bdb9d6eaafa162eaa57636c15354a35184

I was doing a pull of master onto my clone. I wound up having to fix a couple of conflicts in docs/cd_vals.rst which I was a big confused by but did. I then did a git push --dry-run --verbose to make sure it wasn't going to push any changes to master ...

git push --dry-run --verbose
Pushing to github.com:LLNL/H5Z-ZFP.git
To github.com:LLNL/H5Z-ZFP.git
   1660d94..a10bd7b  master -> master

So, I did the push...

git push 
Enumerating objects: 1, done.
Counting objects: 100% (1/1), done.
Writing objects: 100% (1/1), 250 bytes | 250.00 KiB/s, done.
Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Bypassed rule violations for refs/heads/master:
remote: 
remote: - Changes must be made through a pull request.
remote: 
To github.com:LLNL/H5Z-ZFP.git
   1660d94..a10bd7b  master -> master

But, the above referenced commit seems to show I changed 13 files! :confused:

brtnfld commented 1 year ago

@markcmiller86 Sorry, I missed this. Were you able to resolve the issue?

markcmiller86 commented 1 year ago

Ok, well the problem basically stemmed from the fact that I apparently accidentally did all of this on main branch and not on a sub-branch from main. Right answer is probably do undo it and then re-do it correctly. But, its been a month now and more merges have come in since. So, I will simply apologize for my sloppiness here and move on.