Skip to content

Navigation Menu

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

GEOS-ESM / GEOSgcm_GridComp Public

Notifications You must be signed in to change notification settings
Fork 7
Star 9

Code
Issues 100
Pull requests 20
Actions
Projects
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Wiki
Security
Insights

Resolving conflicts during pull requests

Jump to bottom

Ben Auer edited this page Oct 8, 2019 · 1 revision

Test

Toggle table of contents Pages 12

Home
How to Run GEOS Zero Diff Tests
Nonzero diff changes
PCHEM Species file
Pull requests
Resolving conflicts
Resolving conflicts during pull requests
Structural changes
Surface Boundary Conditions and Tile Spaces (make_bcs)
Surface Boundary Conditions and Tile Spaces (make_bcs.py)
Trivial changes
Zero diff changes

Clone this wiki locally

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.