Problem 2: Rebase rigid-shear and Cherry-Pick Override Commit#13
Open
SukiCai wants to merge 2 commits intoChem281Materials:developfrom
Open
Problem 2: Rebase rigid-shear and Cherry-Pick Override Commit#13SukiCai wants to merge 2 commits intoChem281Materials:developfrom
SukiCai wants to merge 2 commits intoChem281Materials:developfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR is to complete Problem 2 for CHEM281 Homework 2.
Related Issue(s)
rigid-shearbranch rebased todevelopbranchadd missing overridecommit has been cherry pick frommaintenancetorigid-shearbranchadd missing overrideis an empty commit,git commit --allow-emptyhas been applied according to the instructionsThe commit dcf2dd2 ("indexing bug fix for ghost comm of remapped velocities across PBC when group all is not used") was dropped because it already exists in the develop branch. During the rebase of rigid-shear onto develop, this commit appeared in the branch history as part of the common base, but it does not represent any unique changes introduced by the rigid-shear branch. Keeping it would duplicate a commit that’s already part of the upstream develop history. Therefore, it was safe and appropriate to drop it to ensure the rebased branch contains only the two required commits :)
Author(s)
@SukiCai
Licensing
By submitting this pull request, I agree, that my contribution will be included in LAMMPS and redistributed under either the GNU General Public License version 2 (GPL v2) or the GNU Lesser General Public License version 2.1 (LGPL v2.1).
Backward Compatibility
Implementation Notes
Post Submission Checklist
Further Information, Files, and Links