Really sorry about that.It seems to be caused by our prior auto-sync from sf.net repos to github.
I also noticed this issue previously.Currently, the repo menu-cache, libfm, pcmanfm-qt, and lxsesion, which are from the old lxde projects are automatically kept in sync with the original repos on sf.net by some facilities set up by Martin previously.The sync seems to be unidirectional and changes in github clones don't get into the sf.net repos.Your fixes needs to be pushed into the sf.net repos instead of the github clones for the old lxde components.So, the only way to solve this issue is moving from old git hosting to our own git.lxde.org as soon as possible.We're in the middle of the migration to our own hosting.Martin is also working on migrating the old mailing list to the new lists.lxde.org server.After finishing them, we can use the same git hosting + mailing list.Now, it's really the time to fix the hosting issue.
On Thu, Nov 28, 2013 at 4:28 PM, Petr Vanek <firstname.lastname@example.org> wrote:
I'm starting to be confused more and more. I merged a pull request 2
I don't see it in commit timeline. And mainly - I'm not able to pull the
First, rewinding head to replay your work on top of it...
Applying: Add LIB_SUFFIX for library destination
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in libfm-qt/CMakeLists.txt
Failed to merge in the changes.
Patch failed at 0001 Add LIB_SUFFIX for library destination
The copy of the patch that failed is found in:
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase
Stopping at 'pcmanfm-qt'; script returned non-zero status.
As I said many times before - I'm not git expert, just a
"pull/commit/push" user but it's quite strange...
(my pain from split repositories growth day by day ;))
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
Lxde-list mailing list