I just started using git and it’s opening my eyes. I created a new branch to completely refactor my auth method (removed Replit Auth and implemented supabase) and now that everything is working I want to merge back into the main branch. But i don’t see how to do this in Replit?
It looks like I could perform the merge on my github desktop and then push those to replit, then l’d be back at the main branch. Is this correct?
Any other suggestions for total noobs with using git?
Hi
There is no UI option for merging (at least yet) so you have to do it from command line.
From the Git panel branches dropdown, switch back to main branch, click Sync/Fetch to make sure the main branch is up to date with git remote. Then open up new shell and run command:
# Replace <branch_name> with the actual name
git merge <branch_name>
Thats it, then commit changes.
Its good practice to make new branch for new features, I also do this every time I add new feature to app.