Git Merge failed referencing missing files -


i'm quite new git excuse me if i'm using wrong terminology. created develop branch off master branch wanted use testing fixes/updates. created new branch called themes wanted merge develop error message have no idea how solve:

conflict (rename/delete): rename files/imagefield_thumbs/advert-photos/favicon.png->sites/all/themes/custom/newtheme origional/images/quote_bottom.png in theme , deleted in head conflict (rename/delete): rename files/imagefield_thumbs/advert-photos/favicon_0.png->sites/all/themes/custom/newtheme origional/images/quote_top.png in theme , deleted in head

this directory files/imagefield_thumbs/advert-photos doesn't exist on either branches not sure why being flagged?

i have .gitignore set ignore files/* well.

hope question makes sense.

steve

there couple of things.

git doesn't track directories, tracks files. had file tracking got renamed. or @ least thinks file renamed. , in branch merging files deleted. git confused want done file, whether file needs moved or should deleted.

you have merge conflict, regular occurrence. need run git merge-tool , allow use file or choose have deleted.

check out section merge conflicts. want comfortable dealing them. http://git-scm.com/book/en/git-branching-basic-branching-and-merging

as git-ignore file, did have files in directory when added that? may have led particular confusion.


Comments

Post a Comment

Popular posts from this blog

java.util.scanner - How to read and add only numbers to array from a text file -

i'm learning java , have question regarding reading file want read numbers file contains strings well. here example of file: 66.56 "3 java 3-43 5-42 2.1 1 and here coding: public class test { public static void main (string [] args){ if (0 < args.length) { file x = new file(args[0]); try{ scanner in = new scanner( new fileinputstream(x)); arraylist<double> test = new arraylist<>(); while(in.hasnext()){ if(in.hasnextdouble()){ double f=in.nextdouble(); test.add(f);} else {in.next();} } catch(ioexception e) { system.err.println("exception during reading: " + e); } } my problem add 66.56,2.1 , 1 doesn't add 3 after "3 or ignores 3-43 , 5-42 can tell me how skip strings , add doubles here? thanks all said 3 ie; "3, 3-43 , 4-42 strings either u read string , split , check number @ " , - or put in space between characters , integers. jvm after compilation tre...
Read more

rewrite - Trouble with Wordpress multiple custom querystrings -

i'm working on adding multiple querystring , doesn't seem work. i've found codes seems work others might i'm missing something. i want like: http://mydomain.com/board/?getyear=2013&getsometext2=sometext to http://mydomain.com/board/2013/sometext/ i added code below functions.php file. doesn't seem work should though. this works. echoing querystring gets both variable without problem. http://mydomain.com/board/2013/sometext/ but doesn't. tested querystring vis isset() seems nothing being set/get http://mydomain.com/board/2013/ function add_query_vars($vars) { $vars[] = "getyear"; $vars[] = "getsometext2"; return $vars; } add_filter('query_vars', 'add_query_vars'); function add_rewrite_rules($arules) { $anewrules = array('board/([^/]+)/([^/]+)/?$' => 'index.php?pagename=board&getyear=$matches[1]&getsometext2=$matches[2]'); $arules = $a...
Read more