What I’m trying to do:
I’m trying to merge to master branch and getting this error. Not sure what to do except to by pass it and continue onto a different branch.
What I’ve tried and what’s not working:
I created a new branch instead and used it as the current published branch, but can seem to go back to the original master branch so currently abandoning that branch until I can merge it.
In simple cases, you can reset the other branch to here instead of merging.
ok thanks, I’ll just continue on a different branch and play with the tool sourcetree to see what’s conflicting it.
Just wanted to post back here my solution. I dabbled with ssh but wasn’t too familiar with how to create one so
step 1. Go to Windows Powershell
Step 2: type
ssh-keygen
Step3: make up a passphrase and remember it.
Step 4: get your key
Step 5: follow the rest of this documentation
Step 6: I wasn’t familiar with Command Line Github so I use https://desktop.github.com/
Step 7: Download the git clone of your project
Step 8: Add the directory of your clone you just downloaded
Step 9: Select Master Branch
Step 10:
Step 11: My problem was the init.py was conflicted between my new branch and the master branch. I had installed some packages but then deleted them when I was in the new branch so it didn’t know how to resolve it. So all I did was selected or told it to use the init.py of the new branch and it was able to merge back to master. I committed it and pushed it to Anvil.
There was a drop down menu I wasn’t able to screenshot or recreate so you’ll have to look around for a drop down menu to select the option of using the init.py of the latest branch.
