Usually you would resolve the conflicts in the affected files manually.
You'll see blocks of
<<< HEAD
...
===
>>> ...
So always choose one of the blocks and delete the rest. Afterwards add the
files normally via git add. If you really want to overwrite, simply copy
the according files from the previous state over an up-to-date workspace.
Toby
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
LMMS-devel mailing list
LMMS-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lmms-devel
