I want to rebase a branch into the main branch so I do
git checkout MyAwesomeBranch
git rebase main
The problem is that I get
Using index info to reconstruct a base tree...
.git/rebase-apply/patch:68: trailing whitespace.
.git/rebase-apply/patch:72: trailing whitespace.
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
error: The following untracked working tree files would be overwritten by merge:
captioning/trial_image.py
Please move or remove them before you merge.
Aborting
error: Failed to merge in the changes.
Patch failed at 0003 trial
hint: Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
I am not sure but I think the problem is that later I make captioning/trial_image.py
become untracked.
How can I overcome this?