OkayStudy
EN English 한국어 日本語 中文 हिन्दी বাংলা اردو Español Português Français Deutsch Русский العربية Bahasa Indonesia Tiếng Việt ไทย Türkçe

How to enable notifications

Notifications are unavailable in this browser or on this address. Try a supported browser on the secure BaeumNova site.

If notifications are blocked, allow them in your browser settings.

  1. Open the site controls beside the address bar, or your browser’s site settings. Set Notifications for this site to Allow.
  2. In your device settings, allow notifications for your browser and check Do Not Disturb or Focus.
  3. Return to BaeumNova and reload the page. Once notifications are on, the bell disappears.

On iPhone or iPad, add BaeumNova to your Home Screen, open it there, then allow notifications.

Guest

Sign in to see your lesson schedule.

Getting started

Start English lessons step by step

Tap a step to go there.

Free trial

  1. Pick a free trial teacher

    Tap a teacher with [Free trial] on the photo.

  2. Tap a time with a gift

    Tap a free time with a gift picture in the timetable.

  3. Sign in and book

    Sign in and it is booked right away. No payment.

  4. Camera & Mic Check

    Check your camera and mic before class.

  5. Check your booked lessons

    See the time and tutor of your booked lesson.

  6. Enter the lesson

    Join the video classroom when it’s time.

  7. Check your past lessons

    Look back at the lessons you finished.

  8. Rate your tutor

    Rate your tutor after the lesson.

About me

  1. Add your profile photo

    A photo helps your tutor recognize you.

  2. Introduce yourself

    Write a hello on the introductions board.

Take lessons

  1. Book a lesson

    Pick a time on a tutor’s timetable.

  2. Pay the lesson fee with PayPal

    Pay on PayPal — your lesson is booked as soon as PayPal confirms it.

  3. Check your booked lessons

    See the time and tutor of your booked lesson.

  4. Enter the lesson

    Join the video classroom when it’s time.

  5. Check your past lessons

    Look back at the lessons you finished.

  6. Rate your tutor

    Rate your tutor after the lesson.

All steps
Step 5

Branching and merging

Split work off and bring it back later. Once you grasp how cheap a branch is, the way you use GIT changes.

What you'll learn

  • You can isolate work on its own
  • You can and resolve a yourself
  • You know branch naming conventions and the basic strategy

A branch is nothing more than a label pointing at a . It doesn't copy files, so creating and deleting one costs almost nothing. That's why in it's normal to open a branch per feature and per . git switch -c <name> creates one and moves you onto it in the same step; when the work is done you come back and merge.

A main road seen from above with a side road that splits off, passes a few milestones and joins the main road again further ahead.
A branch is a side road. Try things there, then merge back into the road.

You merge with git merge. If the two branches touched different files, GIT combines them for you. If they changed the same lines of the same file differently, GIT refuses to guess: it marks a conflict and stops. A conflict is not an error — it's GIT saying "a human has to decide this one".

In a conflict the file gains <<<<<<<, =======, and >>>>>>> markers. Above is your current branch, below is what's coming in. Pick one side or combine both into correct , delete every marker line, then git add and commit to finish the merge. Prefixing branch names with the purpose — feature/, fix/, chore/ — lets the branch list alone tell you what's going on.

Understand it easily

A branch is a side road. You leave the main road to try something, and if it works out you join the main road again (merge). If it does not, you simply leave the side road behind, and the main road was never touched.

Commands for this step

git switch -c feature/login
Create a branch and switch to it in one step.
git switch main
Go back to the branch you want to merge into.
git merge feature/login
Merge the finished branch in. On conflict, GIT stops and asks you to decide.
git branch -d feature/login
Delete a merged branch. Cleaning up keeps the list readable.

Common mistake and how to fix it

Forgetting which branch you are on and committing to main. The first line of git status shows the branch. If it already happened and you have not , make a branch at that spot with git branch feature/x, then run git reset --hard HEAD~1 on main. The commit stays safe on the new branch.

You mark this yourself. Nothing is graded here.

Mark this step as understood?

This cannot be undone yet, so mark it only when you really understand.

Marked as understood

You mark this yourself. Nothing is graded here.

Booking time has passed

Voice chat with Lyen Pick a language and a topic, then talk with Lyen by voice

Lyen speaks aloud in English · 한국어 · 日本語 · हिन्दी. In other languages she answers in text.

Voice chat with Lyen is for members. Sign up first, then start talking.