Git checkout conflict solution

Here are your options to resolve this issue:

—

### 1. **Add the files to Git (commit or stash):**

If the changes or files should be tracked:
1. **Add the files to the staging area:**

git add .

2. **Commit the changes:**

git commit -m "Add language files"

3. Switch branches:

git checkout <branch-name>

Alternatively, you can stash the changes:

git stash
git checkout <branch-name>

—

### 2. **Remove the untracked files:**

If the files are unnecessary or should be regenerated:
1. **Remove the files:**

rm -rf website/wordpress/web/app/languages/*

2. Retry switching branches:

git checkout <branch-name>

—

### 3. **Ignore the files:**

If these are generated files (e.g., translations), you can ignore them by adding their paths to `.gitignore`:
1. Open `.gitignore`:

nano .gitignore

2. Add the paths:

website/wordpress/web/app/languages/*

3. Save and retry:

git checkout <branch-name>

—

### 4. **Force the branch checkout:**

If you're sure the files can be discarded:

git checkout -f <branch-name>

⚠️ **Warning:** This will permanently discard the untracked files.

—

Choose the option depending on whether these files are needed and how you manage them in your workflow.

### 1. **Stash Changes** (if you want to temporarily save your untracked files):
This option is useful if you want to come back to your current changes after switching branches.

git stash
git checkout feature/sage10theme-acron

This will save your untracked changes temporarily and allow you to switch branches. To restore the changes later, use:

git stash pop

—

### 2. **Commit the Changes** (if you want to save your changes permanently):
If you want to keep your changes in the current branch, commit them before switching.

git add .
git commit -m "Save changes before switching to feature/sage10theme-acron"
git checkout feature/sage10theme-acron

—

### 3. **Remove Untracked Files** (if you don't need the files):
If the untracked files are not needed and you just want to discard them:

rm -rf website/wordpress/web/app/languages/*
git checkout feature/sage10theme-acron

This will remove the conflicting files and allow you to switch branches.

—

### 4. **Force Checkout** (if you're okay with discarding untracked files):
If you don't mind losing the untracked files and just want to switch to the branch:

git checkout -f feature/sage10theme-acron

This will discard any untracked files and force the branch switch.

—

Let me know if you need any further clarification or help!

### 1. **Stash the Untracked Files:**

If you want to keep the changes but temporarily store them:

git stash -u
git checkout feature/sage10theme-acron

The `-u` flag tells Git to stash untracked files. After switching branches, you can retrieve the changes later with:

git stash pop

### 2. **Commit the Changes:**

If you want to keep the files in your current branch:

git add .
git commit -m "Commit untracked language files before switching branches"
git checkout feature/sage10theme-acron

### 3. **Remove the Untracked Files:**

If the untracked files are not needed and you just want to remove them:

rm -rf website/wordpress/web/app/languages/*
git checkout feature/sage10theme-acron

### 4. **Force Checkout** (if you don't mind losing untracked files):
If you're sure you don't need the untracked files and just want to discard them, you can force the checkout:

git checkout -f feature/sage10theme-acron

This will discard the untracked files and force the branch switch.

### 5. **Add Files to `.gitignore`** (if you want to ignore the files permanently):
If you don't want these language files to be tracked in Git in the future, you can add them to `.gitignore`:
1. Open `.gitignore`:

nano .gitignore

2. Add the paths to the files:

website/wordpress/web/app/languages/*

3. Save the `.gitignore` file, then try switching branches again:

git checkout feature/sage10theme-acron

—

Choose the option based on whether you want to keep or discard the untracked files. Let me know if you need further assistance!

"It seems like the category image is not showing correctly, but it appears the same as the live site."