I want to totally replace master, actually.
This is a not recommended action, but it is possible. Github probability prevents force push to master (gitlab does)
If you just want feature added to master, the a merge request will suffice if there are no conflicts (do not avoid conflicts).
If there is conflict there are two options.
1 rebase onto master 2 Merge master into feature branch
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
This is a not recommended action, but it is possible. Github probability prevents force push to master (gitlab does)
If you just want feature added to master, the a merge request will suffice if there are no conflicts (do not avoid conflicts).
If there is conflict there are two options.
1 rebase onto master
2 Merge master into feature branch
Handling Merges
Jesse Phillips ・ Jun 22 '19 ・ 3 min read