Closed SimonHeybrock closed 5 months ago
Right, unfortunately GitHub does not manage to resolve the merge conflict automatically, so you will have to do it by hand (or copy your changes to the moved document).
So I again add all changes I made last week to the renamed document in the current main?
Shouldn't we add least add one that reflects the number of digits we know?
Hm, that might confuse readers? Cause then theyd expect we have this errorbar measured or some more deeper reason to apply it?
Shouldn't we add least add one that reflects the number of digits we know?
Hm, that might confuse readers? Cause then theyd expect we have this errorbar measured or some more deeper reason to apply it?
Isn't it more important to get the correct error bars on the final result? We should not just ignore sources of uncertainty, I suppose?
Right, unfortunately GitHub does not manage to resolve the merge conflict automatically, so you will have to do it by hand (or copy your changes to the moved document).
So I again add all changes I made last week to the renamed document in the current main?
Yes, sorry about that, I did not notice that there were concurrent changes to the same file. Is it many changes?
Isn't it more important to get the correct error bars on the final result? We should not just ignore sources of uncertainty, I suppose?
Sure, but it will be the lowest contributing part of the whole workflow - and as I do not find a listed error bar for this exact value, I am unsure to which preciseness it is measured. It is fine with me to just add an artificial errorbar according to the unit we are referring to, i.e., plus/minus 1 barn if the value is 2966 barn.
Right, unfortunately GitHub does not manage to resolve the merge conflict automatically, so you will have to do it by hand (or copy your changes to the moved document).
So I again add all changes I made last week to the renamed document in the current main?
Yes, sorry about that, I did not notice that there were concurrent changes to the same file. Is it many changes?
No worries, I will just look up what it was! Just a bit of text
Right, unfortunately GitHub does not manage to resolve the merge conflict automatically, so you will have to do it by hand (or copy your changes to the moved document).
Shouldn't we add least add one that reflects the number of digits we know?