PROTECTED BRANCH WORKFLOW

Overview

This document describes a workflow for contributing to projects that have a protected `master` branch.  The contribution process involves making an edit, creating a new branch, creating a pull request, merging the pull request, and then deleting the branch you created.  Follow the steps below to make a contribution.

Step By Step

Make Your Edits

  1. Browse the project and use the pencil icon to edit a file like you normally would.
  2. On the edit page, make whatever changes you would like.
  3. At the bottom of the screen, you will be unable to commit your changes to the `master` branch since it is protected.  Instead, type in a short descriptive name to create a new branch.  Like this:
  4. Click Commit Changes to save your work.
  5. If you have multiple changes to make at the same time, you can put them all on the same branch.  Just make sure that you are browsing the branch you just made by verifying the branch name in the branch drop down.  For example, 
  6. Once you are finished with your changes, create a Pull Request.

Create a Pull Request

Once your changes have been made you can create a pull request to merge them into the `master` branch.  Follow these steps.

  1. Under the name of you project, click the “Pull Requests” button that has a number next to it.
  2. Now click the green “New Pull Request” button in the upper right.
  3. In the left hand box make sure that it says “base: master”.  In the right hand box, select the branch you just created.  As an example: 
  4. Give your pull request a title in the title box.
  5. Fill out the description box under “Write” to provide others a description of the changes you are suggesting.
  6. Click the green “Create Pull Request” button.

Merge the Pull Request

In this step, usually someone else on the project should be the person to merge the pull request into the `master` branch.  This may include some discussion or changes to your initial edits, which can be made directly on the new branch you created.

When the pull request is approved, it should be merged by clicking the green “Merge Pull Request” button, 

The final step is to delete the branch that you initially made for the edits.  Whoever merged the pull request should have the option to do this after the branch has been merged.  For example, 

Click Yes on the warning dialog that pops up.  Note that because the branch has already been merged into `master`, there is no data loss in this operation.

MAST technician job description and what to expect.

A MAST technician will encounter a wide range of issues on a MAST. The nature of the issues will be both technical and social. Having impeccable technical skills will only get you part of the way there. You should also be aware that you will need the so-called “soft...

Post MAST-TSP Workshop

Hello all, As we are developing the materials and support that we all need. Would you please add a post here of those things that you would like to have or need to know where it is? For instance - here are the websites that will be good to remember:...

Installing MAST Apps on a tablet

Here is a video on how I install apps...not just any apps....but MAST specific apps on atablet.  I know....sounds exciting!  Well, actually it is.  The work that translators do on these tablets is life changing.  Along with the video, I have added tablet specs and an...

How to Get Help

John explains the different tools used for technical support for Bible Translation.  Email is probably the best type of support.  Just send a helpdesk ticket to [email protected]       https://www.youtube.com/watch?v=mphZwBbiuuU   Some...

Changing Server Settings

Here is documentation on how to set the WACS server up in tStudio Android. I’m thinking that this will become a popular question. Server Settings Keep the settings for the server as determined by the program. There is no need to edit any of the settings unless...

Android Install

The following apps are recommended to install and place on the front pane of an Android tablet for written and oral translation projects.  The tech only items should not appear on pane display.  

Installing SyncThing on a Windows 10 computer

Follow these simple instructions on installing SyncThing on a Windows 10 machine for MAST data collection. Notes: Install SyncTrazor

How to migrate or clone a repo on door43 to WACS

How to migrate or clone a repo on Door43 to WACS. Compare mirror and non-mirror options.

How to format Translation Notes for publishing (V-MAST)

In V-MAST, translators are given free rein to reformat the content. However, they should not reformat content destined to be published as source text. This article specifies the expected content format. Note that BTT Writer does its own formatting when translating tN,...

How to Prepare tS Translation Notes Projects for Publishing

Note: This article is one in a series of articles describing how to get a GL project ready to publish so that others can benefit from it. This article deals with Translation Notes (tN) projects created in translationStudio. A complete Bible tN project consists of...