Merging content of 2 directories on separate git branches and integrating branches later -


i have project hosted @ github. developing new set of features on shared topic branch named metamodel pushed github. @ same time have ongoing bug-fix work happening on master. plan integrate metamodel master @ point metamodel branch go away. both of these branches contain 2 directories contents want merge 1 single directory. @ point 2 directories divergent between 2 branches. furthermore, continue diverge more until branch integration.

what happen when go integrate branches if have merged 2 directories on each branch independently? we, project, have elected integrate branches means of rebasing in case has bearing here.

git doesn't care directories, or file names. cares content. , rather intelligent merging (it'll figure out when things moved or renamed).

so, basically, in answer question of "what happen when integrate these branches together", answer - "i don't know." haven't seen content. can tell git rather efficiently compare differences/similarities in content, , combine rather nicely. git gets stuck on show merge conflict, , you'll have resolve on case-by-case basis.

in situation, i'd careful rebasing, considering git history , changes starting become rather complex. rebase may work fine, i'd ready rollback in case gets messy.

since branches strong diverged , gone different routes , paths, may better off doing straight merge bring them together. way don't risk rewriting history in detrimental/unrecoverable way (remember rebasing form of rewriting history). plus, straight git merge produce new commit combined, (considering drastic differences have occurred), may valuable "fork-in-the-road" commit have, in case need rollback.


Comments

Post a Comment

Popular posts from this blog

java - Play! framework 2.0: How to display multiple image? -

i need display gallery of photos. here template: @(photos: list[photo]) @title = { <bold>gallery</bold> } @main(title,"photo"){ <ul class="thumbnails"> @for(photo <- photos) { <li class="span3"> <a href="#" class="thumbnail"> <img src="@photo.path" alt=""> </a> </li> } </ul> } and here controller method: public static result getphotos() { return ok(views.html.photo.gallery.render(photo.get())); } and here photo bean : @entity public class photo extends model { @id public long id; @required public string label; public string path; public photo(string path, string label) { this.path = path; this.label = label; } private static finder<long, photo> find = new finder<long, photo>( long.class, photo.class); public static list<phot...
Read more

gmail - Is there any documentation for read-only access to the Google Contacts API? -

i want read-only access user's google contacts. there stackoverflow member wanted this, , received following answer : yes, there is, use https://www.googleapis.com/auth/contacts.readonly scope , "view contacts". this exchange reference read-only access google contacts can find using google. simply using access token obtained attempt read usual google contacts api (i.e. https://www.google.com/m8/feeds ) fails insufficient permissions. similarly, using google contacts api on new target fails 404 errors (for example https://www.googleapis.com/auth/contacts.readonly/default/full ). is there documentation anywhere on how use api, or permissible way access google contacts api full read-write access?
Read more

php - Controller/JToolBar not working in Joomla 2.5 -

relevant code: jtoolbarhelper::custom('savecategories', 'save', '', 'save', false, false); ... <input type="hidden" name="controller" value="easyblogcontroller"> according can dig docs , own previous questions, should call savecategories() function in easyblogcontroller . i've tried setting value easyblog , easyblog.php (file name) current easyblogcontroller (class name). clicking on save button refreshes page. not redirect, echo or var_dump test code put in savecategories() function. var_dump ing jrequest::getvar('controller') , 'task' return correct values. creating controller object , using $controller->execute('task'); works. the values going depend on location of controller trying call, , have couple options here. typically there controller in base folder of component (likely components/com_easyblog) in file called controller.php , class name inside ...
Read more