Re: Git Unrelated Histories

2018-08-29 Thread Stefan Beller
+cc the mailing list > > > > > > git merge development_feature_branch > > > fatal: refusing to merge unrelated histories > > > > > > > See the git merge man page for the > > --allow-unrelated-histories switch. > > I have tried that switch, however when merging a small feature branch, > the merge

Fwd: Git Unrelated Histories

2018-08-29 Thread Tomas Zubiri
Thank you for taking the time to help me Stefan On Aug 29, 2018 15:15, "Stefan Beller" wrote: > > On Wed, Aug 29, 2018 at 9:49 AM Tomas Zubiri wrote: > > > > Hello all, > > > > I have recently joined a team there seems to be a couple of issue > > with the git repositories: > > > > > > 1- A bra

Re: Git Unrelated Histories

2018-08-29 Thread Stefan Beller
On Wed, Aug 29, 2018 at 9:49 AM Tomas Zubiri wrote: > > Hello all, > > I have recently joined a team there seems to be a couple of issue > with the git repositories: > > > 1- A branch created from development cannot be merged into the > production branch. > > > > (production) > > git merge develo

Git Unrelated Histories

2018-08-29 Thread Tomas Zubiri
Hello all, I have recently joined a team there seems to be a couple of issue with the git repositories: 1- A branch created from development cannot be merged into the production branch. (production) git merge development_feature_branch fatal: refusing to merge unrelated histories 2-