meta data for this page
  •  

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Next revision		Previous revision
git:merge [2016/06/16 13:08] – created niziakgit:merge [2022/02/04 11:42] (current) – niziak
Line 1: Line 1:
-====== Merge another repo (RRR) into directory of repo (LLL) ======+====== merge ====== 
 + 
 +====== merge conflicts ======
  
-Idea is to fetch remote repo RRR into local repo LLL 
-Then modify file location of repo BBB to be in desired path and merge it into repo LLL. 
 <code bash> <code bash>
-git remote add RRR http://URI_to_RRR_repo +git checkout --ours PATH/FILE 
-git fetch RRR +git checkout --theirs PATH/FILE 
-git checkout -b branch_change_file_location RRR/master+</code>
  
-# now move files from remote repo RRR into correct path 
  
-mkdir app_RRR 
-git mv src app_RRR/src 
-git commit -m "location of app_RRR adapted to local repo" 
  
-# switch to LLL repo  
-git checkout master                 
-# merge previously created branch "LLL/branch_change_file_location" into "LLL/master" 
-git merge branch_change_file_location 
-git commit 
- 
-# cleanup 
-git remote rm RRR 
-git branch -d branch_change_file_location 
- 
-# push merged master 
-git push                            
-</code>