Install Yarn Ubuntu

1. **Update package list**:

sudo apt update

2. **Install prerequisites**:
Install `curl` if it's not already installed:

sudo apt install curl

3. **Add Yarn's official APT repository**:
Import the Yarn GPG key:

curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo tee /etc/apt/trusted.gpg.d/yarn.asc

Add the Yarn APT repository:

echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list

4. **Update package list again**:

sudo apt update

5. **Install Yarn**:

sudo apt install yarn

6. **Verify the installation**:
After the installation is complete, you can verify Yarn's version by running:

yarn --version

This will install the latest stable version of Yarn on your Ubuntu system.

### Steps to resolve the merge:

1. **Check the status of your repository**:
Run the following command to see which files are in conflict and need to be resolved:

git status

2. **Resolve conflicts**:
If there are merge conflicts, open the conflicting files and manually resolve the issues. Conflict markers in the files will look like this:

<<<<<<< HEAD
   Your changes here
   =======
   Incoming changes here
   >>>>>>> branch-name

Keep the changes you want and remove the conflict markers.

3. **Stage the resolved files**:
After resolving the conflicts, stage the files for commit:

git add <file1> <file2> ...   # or use `git add .` to stage all changes

4. **Commit the merge**:
After staging the resolved files, commit the merge:

git commit

Git may automatically create a merge commit message. You can modify this message if needed, or just save and close the editor.

5. **Complete the merge**:
Now that the merge is committed, you can continue with your intended operations, such as pulling, pushing, or checking out a branch:

git pull   # If you were trying to pull

### If you want to abort the merge:
If you don't want to finish the merge and want to cancel the process, you can abort the merge by running:

git merge --abort

This will revert your repository to the state before the merge began. You can then try a new merge or resolve the issue differently.

Let me know if you need further assistance!

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commits each, respectively.
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# modified: bitbucket-pipelines.yaml
# modified: resources/js/app.js

### To complete the merge:
1. **Commit the merge**:
The commit message already contains information about the merge, and you can keep this message as it is or modify it. To finalize the commit:
– If you are using a terminal editor like Vim, press `Esc`, then type `:wq` (write and quit) and press `Enter` to save the commit message and finish the merge.

Alternatively, if you're using a different editor (like Nano), save the commit message and exit the editor.

2. **If you do not want to commit**:
If you decided not to proceed with the merge and want to discard the changes, you can abort the merge by running:

git merge --abort

This will restore your repository to its state before the merge started.

### After the merge commit:
Once the merge is committed, you can push your changes to the remote repository:

git push origin master

This will synchronize your local `master` branch with the remote repository on Bitbucket.

Let me know if you encounter any issues!