Closed rhl-bthr closed 5 years ago
Thanks. Reviewed to 8166eb0. Not tested. Lost of symbolic constants for os.statvfs
is unfortunate; is there any alternative?
is there any alternative?
None that I could see
@pro-panda i am not getting why there is merge conflicts in src/jarabe/controlpanel/cmd.py?
GitHub does a poor job of showing divergent histories. The best view is Network but you have to somehow look at both sugarlabs and pro-panda repositories at the same time to see the problem.
Use a git history visualiser, such as git log
with several options or gitk --all
, and you'll see that this branch diverged from master some time ago.
Latest commit common to both branches is c36b7fb8fb4acbe30ca118813e7fa90afbb45662.
Anyone can fix this. Skills needed are git conflict resolution, or rebasing, combined with a good understanding of the intent of each patch.
I'll put this on my list to do today.
Did git checkout python3
, git rebase -i master
, resolved conflicts, and git push --force
.
@quozl Is this issue complete or there is anything else to still work on?
em.py is removed from master, as well as popwindow commit is merged. Rebased and resolved conflicts with master. Replaced by #844
Fixes #787