Category "rebase"

How to merge a development branch into the master and ignore the changes in the master?

following situation: I made some changes in the development branch ( commit f + g ). Unfortunately, there were some changes in the master branch (commit e + d),

Fast-forward merge is not possible. To merge this request, first rebase locally

Recently, I have created newbranch and created a merge request to Master branch. Before TeamLead accept merge request into Master branch another team member was

Git refusing to merge unrelated histories on rebase

During git rebase origin/development the following error message is shown from Git: fatal: refusing to merge unrelated histories Error redoing merge 1234deadbe