My workflow was:
- Clone repo to my machine.
- Create feature branch locally.
- Begin doing work.
- Incrementally push to the remote feature branch as I'm developing.
- Finish work, create a pull request on BitBucket through the web interface.
- Receive a message that I have to Resolve conflicts.
- On my local, checkout master and merge my feature branch into master.
- Try to push master back to the remote server, get "Branch refs/heads/master can only be modified through pull requests"
Now it appears that I'm stuck with both my local repo and remote repo unusable because I can't merge the pull request and I can't push to master.
What is a best-practice/commonly-used workflow for getting from my start point (working and committing frequently to a feature branch on my local) to the desired end state (changes for the feature successfully mereged into local)?
