Can someone please help me? I have searched for 1 hour, still no idea. On stackoverflow, they all advice to call
$ git reset --help but I guess this will discard my changes. > I have > one problem left. My working tree (of my fork) was too old, so I did > > $ git stash > $ git pull > $ git stash pop > plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp: > needs merge unfähig die Staging-Area zu aktualisieren # English meaning: > unable to refresh the staging area > > What should I do if I want to accept the version from my stash and discard > your new version (i.e. overwrite yours with my stashed one)? Thanks on > advance. ------------------------------------------------------------------------------ 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
