Skip to content

document resolving merge conflicts with git #1434

@josephjclark

Description

@josephjclark

Add docs which show how you can use git to resolve conflicts between a project and sandbox

I've said many times "just use git!" and can picture it in my head. But I've not done it myself directly, and would like a step by step guide to show the feel of it.

Metadata

Metadata

Assignees

No one assigned

    Labels

    documentationImprovements or additions to documentationsync v2

    Type

    No type
    No fields configured for issues without a type.

    Projects

    Status

    Ready

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions