Hi, you should try to do the merge from the command line and paste de error messages if you want some help.
El mié., 9 de may. de 2018 a la(s) 09:30, Tony Chamberlain < chamberlain.anth...@gmail.com> escribió: > We have a whole department using git who, when there are conflicts, undo > all their changes, save them somewhere, replace with head, pull and then > redo their changes, as no one can figure out this merge. > > On Thursday, March 22, 2018 at 11:26:06 AM UTC-5, Tony Chamberlain wrote: >> >> I want to merge the two branches as shown in the attached image, using >> egit with Eclipse. >> I came across this, which does not work for me: >> https://allaboutmynonexistedworld.wordpress.com/2014/02/05/eclipse-git-merging-branch-to-master/ >> >> I cloned the two as you see. Kept trying things. First the local just >> showed "master" so I went to remote and right clicked on checkout, and >> checked it out. I did then try as above to do "merge". I did get a window >> about conflict which I clicked OK on (see 2nd attachment). But then >> nothing was shown as red. When I did a synchronize on my master, there >> were no changes. I did not get any red and could not open a merge tool. >> What am I doing wrong? >> >> >> >> >> -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
