「view this page in B3 βῆτα server」

Revisions №57938

branch: master 「№57938」
Commited by: Rhiju Das
GitHub commit link: 「4ad765f9b2116798」 「№585」
Difference from previous tested commit:  code diff
Commit date: 2015-06-25 14:00:15

Merge pull request #585 from RosettaCommons/rhiju/resleveltask_in_separate_file Rhiju/resleveltask in separate file This may cause headaches to folks doing future merges to/from master who have changed the class ResidueLevelTask_ . Unfortunately, while git does track movement of functions within files, it generally fails to check movement across files. If you run into an issue with a conflict in your branch involving PackerLevelTask_.cc when trying to merge master, the best thing to do is: git diff <commit at head of your branch> core/pack/task/PackerTask_.cc Record changes that you made in the ResidueLevelTask_ class functions. Then make sure they go into the new ResidueLevelTask_.cc file, and remove your conflicting code block in PackerLevelTask_.cc.

...