How to fix Initial commit on orphan branch - no parent exists in Git

# Check if you're on an orphan branch (no commits yet)
git status
# Output will show "No commits yet" for a new orphan branch

# Add files to the new orphan branch
git add .

# Create the first commit (this will be a root commit)
git commit -m "Initial commit on orphan branch"

# Push the orphan branch to remote
git push -u origin your-orphan-branch

# Remove all staged files inherited from the previous branch
git rm -rf .

# Verify working directory is clean
ls -la

# Now add only the files you want
git add your-new-files/
git commit -m "Initial commit"

# Creates orphan branch AND clears working directory
git switch --orphan new-branch-name

# Working directory is now empty - add your files
echo "# My Project" > README.md
git add README.md
git commit -m "Initial commit"

# Abandon the orphan branch
git checkout main  # or master, or your base branch

# Create a regular branch with full history
git checkout -b my-feature-branch

# Or using git switch (Git 2.23+)
git switch -c my-feature-branch

# Switch to another branch first
git checkout main

# Delete the local orphan branch
git branch -D unwanted-orphan-branch

# If already pushed, delete from remote
git push origin --delete unwanted-orphan-branch

git checkout main
git merge orphan-branch --allow-unrelated-histories

# Resolve any conflicts that arise
git add .
git commit -m "Merge orphan branch into main"