'How to reproduce foxtrot merge git
Few of my team members encountered foxtrot merge error in Bitbucket for couple of times. I was able to fix them by merging through rebase as I know it is all about getting all commits properly and then merge:
git checkout feat
git rebase master // straight history in local feat branch
git checkout master
git rebase feat // straight history in local master branch
git push
I feel like I am right on this statement - The foxtrot merge happens when a commit that was previously there in origin/master but now SOMEHOW moved to my local feat (so to origin/feat) branch and I am trying to merge origin/feat to origin/master. But, I could not reproduce it in my test repo. I am not sure how to solve this SOMEHOW part above. If somebody is kind enough to answer this please be very concise so that I can understand - I already read lot of big answers here or in other blogs.
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|