rawtransfer.py merge conflict in trunk branch
Added by Christopher Lilienthal about 5 years ago
I saw there is a merge conflict in the leginon/rawtransfer.py file in the trunk branch. I was tempted to fix this myself but I am not familiar with the changes being made so I decided to just let you know instead.
Replies (3)
RE: rawtransfer.py merge conflict in trunk branch - Added by Anchi Cheng about 5 years ago
Umm. is there local change ? If yes, use
git stash
Before you pull
and then
git stash pop
to bring your local change back.
If this is not the case, just use the head version. Otherwise, send me the conflicted file so I can see what it is complaining about. I do not see that on my sandbox.
RE: rawtransfer.py merge conflict in trunk branch - Added by Christopher Lilienthal about 5 years ago
You can see the merge conflict here: http://emg.nysbc.org/projects/leginon/repository/revisions/trunk/entry/leginon/rawtransfer.py
RE: rawtransfer.py merge conflict in trunk branch (RESOLVED) - Added by Anchi Cheng about 5 years ago
Created the issue #7182 and fixed it. It only affected trunk.