Rebase

Hello,

I am looking for some assistance rebasing please.

I have a feature branch which has the many recent commits and a main branch which has not had a commit for a long time. I want to make the code in the feature branch the code in the main branch.

I think a rebase is the command I need, but the exact steps I am not sure of.

I did try this:

1. Sync both branches with remote (github)
2. git checkout feature
3. git rebase main

That resulted in the following perge conflicts:

PS C:\Users\AlGrant\andrej_branch\test_fft> git rebase main error: could not apply 1f893dc... Make project runnable on Linux 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". Could not apply 1f893dc... Make project runnable on Linux Auto-merging src/kiwitracker/sample_processor.py CONFLICT (content): Merge conflict in src/kiwitracker/sample_processor.py Auto-merging src/kiwitracker/common.py CONFLICT (content): Merge conflict in src/kiwitracker/common.py PS C:\Users\AlGrant\andrej_branch\test_fft> git rebase --abort

Which I have now aborted. I dont understand why I even have to deal with merge conflicts when I want to keep the code in feature and make it main.

Help.

Thanks

Al