I had a look at the referenced blog. I suspect (I don't use Eclipse) that
this is simply a misunderstanding about how (Git DVCS) version control
attempts to work, how the menus are implemented, and how the merge issues
should be resolved.
At around step 6, it appears that the tool is trying to hide the original
conflict, and asking you to choose a side (pre conflict?) and then (7.) edit
in (insert) the changes that are needed.
At this point (the potential inability to see what the conflict was), it all
becomes a bit hazy as to the right method for solution.
Maybe you need the right merge tool to be made available. It probably needs
to show both sides as a comparison.
The alternative is to use the Git Gui (or via the Gitk viewer) to review the
'in worktree' conflict markers that git left in place, so that you can make
you own choices.
Having the Git Gui open in an independent window (and using its
refresh/rescan button) is a great way to see what is really going on.
The menu system looks like its trying to be like TortoiseSVN and similar in
treating the user (the one that brought the brain to work ;-) as being a bit
dumb and hiding the tricky bits that intellligence overcomes... [I'm letting
my bias show ..] I eventually ditched those menu interfaces and now just use
the pairing of the command line and the git gui / gitk. Works pretty good.
Aside: You didn't say what your workflow style was? This can have a big
impact as some flows put the user in conflict with the process, rather than
the process supporting the users. A feature branch and merge can work well,
but one needs to decide where the branches are allowed to start from, how
clean they should be (i.e. rebased, every commit functional, etc.), and how
usesrs keep their personal space.
Philip
----- Original Message -----
From: "Nelson Efrain A. Cruz" <nea...@gmail.com>
To: <git-users@googlegroups.com>
Sent: Wednesday, May 09, 2018 3:37 PM
Subject: Re: [git-users] Re: Trying unsuccessfully to merge a branch back
into master using egit.
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.
--
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.
