Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix error in resuspension mods introduced during merge of mom. #550

Merged
merged 1 commit into from
Dec 11, 2015
Merged

Fix error in resuspension mods introduced during merge of mom. #550

merged 1 commit into from
Dec 11, 2015

Conversation

susburrows
Copy link
Contributor

Fixes a merge error between changes introduced in #415 and #416

Fixes #545

[non-BFB]

@susburrows susburrows added this to the v1.0 Alpha milestone Dec 11, 2015
yjinho referenced this pull request Dec 11, 2015
@yjinho
Merge branch 'susburrows/atm/marine-organic-emissions' into next (PR #…
1d55358 
…415)

This is to fix merge conflict of ./cam/bld/build-namelist

[BFB]
@yjinho yjinho merged commit b6a1b3a into next Dec 11, 2015
yjinho added a commit that referenced this pull request Dec 11, 2015
@yjinho
Merge branch 'susburrows/atm/resus_organics_mergefix' into next (PR #550
61c62b5 
)

Fixes a merge error between changes introduced in #415 and #416

[BFB]
@rljacob
Copy link
Member

rljacob commented Dec 12, 2015

Is the target for this really supposed to be "next" instead of "master"?

@susburrows
Copy link
Contributor Author

That was intentional on my part since it was an error in the merge to "next" that caused it. We are not sure what the best way is to handle this kind of bad merge situation, other than being more cautious when merging to "master". Any advice/guidance on this?

@susburrows susburrows deleted the susburrows/atm/resus_organics_mergefix branch December 14, 2015 02:01
susburrows added a commit that referenced this pull request Dec 21, 2015
@susburrows
Revert "Merge branch 'susburrows/atm/resus_organics_mergefix' into ne…
1a0dac8 
…xt (PR #550)"

This reverts commit 61c62b5, reversing
changes made to 85c0c0a.

Conflicts:
	components/cam/bld/build-namelist
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@yjinho yjinho

Labels
Atmosphere bug fix PR
Projects
None yet
Milestone
v1.0 Alpha.1
Development

Successfully merging this pull request may close these issues.
3 participants
@susburrows @rljacob @yjinho