Training eSupport System
  • Log In
    • Log in with LS Login
    • Login
    • Register
  • About
  • Events
  • Materials
  • e-Learning
  • Workflows
  • Collections
  • Learning paths
  • Directory
    • Providers
    • Nodes

TeSS makes use of some necessary cookies to provide its core functionality. Additionally, we make use of Google Analytics to discover how people are using TeSS in order to help us improve the service. To opt out of this, choose the "Allow necessary cookies" option.

See our Privacy Policy for more information.

You can modify your cookie preferences at any time here, or from the link in the footer.

Allow necessary cookies Allow all cookies
  1. Home
  2. Materials
  3. Conflicts

Content provider

Software Carpentry

The Software Carpentry Foundation is a non-profit organization whose members teach researchers basic software skills.

Conflicts

View material

Conflicts from https://github.com/swcarpentry/bc/tree/gh-pages/novice/git/03-conflict.md.

Keywords: Git

Target audience: Novice


Activity log
Training eSupport System
tess-support@googlegroups.com
Contribute
About TeSS
Funding & acknowledgements
Privacy
Cookie preferences
Version: 1.4.1
Source code
API documentation
Bioschemas testing tool

TeSS has received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 676559.