git merge - Git Subtree Merging reports conflict when merging a simple upstream change -


i'm getting started learning subtree merging in git 1.8.2. have created simple example test change third party repo migrating main project.

i'm following 6.7 git tools - subtree merging example.

the 'sub' project included subdirectory in 'main' project.

after make change 'sub' project, git reports conflict when try merge change 'main' project.

test summary

  1. created repos projects 'main' , 'sub' (sub instead of rack)
  2. add remote named sub_remote main refers sub
  3. track sub_remote using sub_branch
  4. change , commit 1 line in file in 'sub' project
  5. pull changes sub on main/sub_branch
  6. merge main/sub_branch main/master.

the merge fails conflict. merge confused version of changed line keep.

<<<<<<< head main ======= main upstream change >>>>>>> sub_branch main.git sub sub.git tm

complete test script

#!/bin/sh  # initialize empty repos in main sub   rm -rf $i{,.git}   mkdir $i.git   cd $i.git;   git --bare init;   cd ..;   git clone $i.git   cd $i   echo $i > readme.md   git add readme.md   git commit -a -m "added readme.md"   git push origin master   cd .. done  # add data sub ls > sub/data cd sub git add data git commit -m "added data" git push origin master cd ..  # add sub sub-tree in main cd main git remote add sub_remote ../sub.git git fetch sub_remote git checkout -b sub_branch sub_remote/master git checkout master git read-tree --prefix=sub/ -u sub_branch git commit -m "added sub" git push origin master cd ..  # make change sub cd sub sed -i -e 's/main$/main upstream change/' data git commit -a -m "upstream change made data" git push origin master cd ..  # merge sub change main cd main git checkout sub_branch git pull  #merge sub_branch changes master git checkout master git merge -s subtree sub_branch cat sub/data

what read-tree doing in case adding directory in current tree contents of tree. contents added regular file , directories being created , added, there no history carried over. these files treated if created them.

when try merge process fails since sees sub_branch history created data file, , target directory contain different data file created you.

the page using missing important step make subtree works properly, can able pull updates it.

the proper example can seen in both these pages: https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html https://help.github.com/articles/working-with-subtree-merge

what missing in case link history when create subtree:

# create merge record not change in tree yet git merge -s ours --no-commit sub_branch # bring changes , place them in proper subdirectory git read-tree --prefix=sub/ -u sub_branch

after main repository contain history of sub repository. calls merge failing should work properly. calling git log --graph let see how different commits being merged.


Comments

Post a Comment

Popular posts from this blog

monitor web browser programmatically in Android? -

i've got tricky question here. need users make payment bank (namely barclaycard) in uk. so, have https url , add parameters (such amount pay, order reference, etc) url, start http connection intent.actionview, redirect user browser can enter credit card details on bank's webpage , make payment our account successfully. far ? the code use below (i changed values privacy reasons) problem is, need app when user has completed/failed/cancelled payment. barclaycardautomatically redirects particular url when payment has succeeded, 1 if failed. there no way of knowing when barclaycard payment has succeeded go android app somehow ? button cardbutton = (button) findviewbyid(r.id.card_button); cardbutton.setonclicklistener(new view.onclicklistener() { @override public void onclick(view arg0) { string prehashstring = new string(); string prohashstring = new string(); string shapassphrase = new string(); shapassphrase = "gsvth£h70zkh...
Read more

Shrink a YouTube video to responsive width -

i have youtube video embedded on our website , when shrink screen tablet or phone sizes stops shrinking @ around 560px in width. standard youtube videos or there can add code make go smaller? you can make youtube videos responsive css. wrap iframe in div class of "videowrapper" , apply following styles: .videowrapper { float: none; clear: both; width: 100%; position: relative; padding-bottom: 56.25%; padding-top: 25px; height: 0; } .videowrapper iframe { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } the .videowrapper div should inside responsive element. padding on .videowrapper necessary keep video collapsing. may have tweak numbers depending upon layout.
Read more

wpf - PdfWriter.GetInstance throws System.NullReferenceException -

i'm trying create pdf document using itextsharp 5.3.4 using following document document = new document(); filestream stm = new filestream(filename, filemode.create); pdfwriter writer = pdfwriter.getinstance(document, stm); i'm getting system.nullreferenceexception following stack trace: system.nullreferenceexception occurred hresult=-2147467261 message=la référence d'objet n'est pas définie à une instance d'un objet. source=itextsharp stacktrace: à itextsharp.text.version.getinstance() innerexception: i've verified neither document nor stm null, , if select "continue" in vs12 document created - exception thrown. updated itextsharp 5.4.0 , it's still occurring. can't find information on anywhere - got ideas? make sure not catching exceptions. nullreferenceexception can 1 caught , handled inside itextsharp, don't care it. fact can continue supports theory. change following setting verify: debug -> exceptions ...
Read more