Skip to content

Conversation

Baokangwen
Copy link

Upload SSRF BL19U1 Beamline mxcubecore code

2、发现一个response的拼写错误,已改正
Copy link
Collaborator

@rhfogh rhfogh left a 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?

@marcus-oscarsson
Copy link
Member

As you just opened #1369 does it mean that we can close this one ?

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.

5 participants