Skip to main content
Columbia University in the City of New York
Columbia University
Data Journalism Resources logoData Journalism Resources

Main navigation expanded

  • Learning
  • Teaching
  • Tools
  • About
  • Cleaning Data
  • Analyzing Data
  • Scraping Data
  • Visualizing Data
  • Mapping
  • Coding
  • Working with Algorithms
  • Web Design
  • Securing Data
  • Sample Syllabi
  • Handbooks
  • Teaching Guides
  • Newsroom Guides
Data Journalism Resources logo Data Journalism Resources

You are here:

  1. Home
  2. Read
  3. Conflicts, Branches and Merges with git & GitHub

Conflicts, Branches and Merges with git & GitHub

Related Content

All Coding Resources

Google slides on avoiding and resolving conflicts in git and GitHub

Contributor: Susan McGregor

Conflicts, Branches and Merges with git & GitHub.pdf102.81 KB

Document Topics

Coding

Phone

212-854-8608

Contact Us

[email protected]

Follow Us

Facebook Twitter Instagram Youtube
Columbia University Columbia University Logo
©2025 Columbia University Accessibility Nondiscrimination Careers Built using Columbia Sites