-
Notifications
You must be signed in to change notification settings - Fork 55
SSRF BL19U1 Beamline #1368
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
base: develop
Are you sure you want to change the base?
SSRF BL19U1 Beamline #1368
Conversation
2、发现一个response的拼写错误,已改正
…nt的一个状态设置为disabled
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is very welcome, but something is wrong here.
- There are changes in 2651 files, and it looks like every line in every file is changed (according to the github diff program).
- Comparing the two branches on my local machine (in pycharm) it looks like the bao branch has some very old versions of the files I looked at (GPhL code). The comment on tha bao branch in gitub says "This branch is 168 commits ahead of, 1539 commits behind mxcube/mxcubecore:develop."
- My editor seems to suggests that the bao files are using CR;LF as line separators (as in windows files) whereas we have standardised on linux line separators.
It could be that - this being the first (?) PR from SSRF - the procedure needs adjusting. Could you rebase (preferably) cherry-pick, or merge so that the branch being pushed is completely ahead of the mxcubecore develop branch, and also check that you are using the right line separators?
As you just opened #1369 does it mean that we can close this one ? |
Upload SSRF BL19U1 Beamline mxcubecore code