Manual Solving Pull-Request Conflicts

Manual Solving Pull-Request Conflicts

There are instances where a DCS github user submits a Pull-Request from their Fork of the repository which cannot be Merged automatically. The steps below will identify one approach for a repository administrator to solve this problem. This approach requires that that...
Manual Solving Pull-Request Conflicts

Suggest an Edit on DCS

Overview You may suggest an edit to someone else’s work on the Door43 Content Service using the following procedure.  Keep in mind that most users will gladly receive suggestions using this process. The process described below is called the “fork and pull...
Manual Solving Pull-Request Conflicts

How to Create a New Release

This document is intended to provide a Content Release Structure checklist.  The goal is that each release is clearly identified in a consistent manner.  The versioning scheme used across the Door43 ecosystem is defined at https://unfoldingword.org/versioning/....
Manual Solving Pull-Request Conflicts

Translate Content Online

Overview If you want to translate a project online, you may do so by using the Door43 Content Service.  Note that you will need to have a basic knowledge of Markdown or USFM formatting, depending on the project. Step by Step The following procedure assumes that you...
Manual Solving Pull-Request Conflicts

Workflow Using SmartGit

Forking/Branching Workflow Before beginning this procedure, it is a good idea to remove all copies of the repository from your computer. If you are concerned you might lose something, you can alternately move all copies of the repository to a backup location where...