{"thread":{"id":"50423","subject":"Fwd: Query on GIT merge and conflicts","startedAt":"2019-02-07T07:59:41Z","lastAt":"2019-02-07T07:59:41Z","messageCount":1,"participants":["Vijay Sundar V"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"368670","messageId":"CAMj2QEsdJLsATrOvGJwGpe2fv=QzVU-6LqWJtdZArdMjFyZiYA@mail.gmail.com","threadId":"50423","inReplyTo":"CAMj2QEvOzOUbLvwudAn5zoyOqc=HixsQ+SuU__rU4GZ5uDN6ww@mail.gmail.com","subject":"Fwd: Query on GIT merge and conflicts","fromName":"Vijay Sundar V","fromEmail":"dops.vijayv@gmail.com","sentAt":"2019-02-07T07:59:27Z","receivedAt":"2019-02-07T07:59:41Z","isPatch":false,"sender":{"key":"dops.vijayv@gmail.com","avatar":null},"body":"Hi Team,\n\nI've query for which we have no solutions from Stackoverflow. Or we\ncouldn't find one. Would be great if you have one or can provide\nsuggestions with.\n\nSO Link: https://stackoverflow.com/questions/53704320/git-merge-remote-repository-project-to-sub-directory-of-current-repository-proje\n\nI need to merge a particular branch from one project to a different\nbranch in another currently running project . For which I am following\nbelow steps\n\nIn Source Repo-A: v23-branch, I created a local temp branch and moved\nall the contents to a folder and made a local commit. Then In Target\nRepo-B, I added the local git path like given below. git remote add\ntmpmerge <local url of Source Repo-A: v23-branch> Then did a git fetch\nof tmpmerge to get the branch details of Source Repo-A. And while\ndoing a git merge tmpmerge/temp --allow-unrelated-histories, I get so\nmany merge conflicts as describe in the bottom.\n\nBelow is the tree structure I am expecting to achieve it\n\nSource Repo-A: v23-branch\n   module1\n   module2\n   pom.xml\n   Dockerfile\n\nTarget Repo B: some-branch\n   source Repo-A: v21-branch\n   |-module1\n   |-module2\n   |-pom.xml\n   |-Dockerfile\n   Repo-B-Files1\n   Repo-B-Files2\n   Repo-B-Files3\n   pom.xml\n   Jenkinsfile\n   Dockerfile\n\nWhat I want to achieve is given below.\n\nTarget Repo B: some-branch\nsource Repo-A: v21-branch\n|-source Repo-A: v23-branch\n  |-module1\n  |-module2\n  |-pom.xml\n  |-Dockerfile\n|-module1\n|-module2\n|-pom.xml\n|-Dockerfile\nRepo-B-Files1\nRepo-B-Files2\nRepo-B-Files3\npom.xml\nJenkinsfile\nDockerfile\n\nI want to merge source repo module to the destination module as\nmentioned above structure because While merging contents as parent\ndirectory overwrites some of my existing files available in the\ncurrent project like pom.xml , docker file etc. Instead of merging to\ncurrent project parent directory I want to write as sub directory with\nall its log and history. But I'm facing CONFLICT(rename/delete),\nCONFLICT(rename/rename) for module files... Thanks much in advance.\n\nThanks,\n\nVijay V\n"}]}