github - Error with git rebase ("could not apply...") -

-

i'm administrator of github repository https://github.com/plison/opendial. reduce number of commits on repository, since repository has few thousand commits, many of whom minor debugging changes squashed (especially ones few years old).

i'm therefore trying apply rebasing in order squash part of commits. however, i've experience following issue:

  1. when type e.g. git rebase -i head~10, quite long number of commit lines (much more 10) in interactive editor. reason?
  2. more importantly, once close interactive editor start rebasing, systematically error message "error:could not apply ', even when not make change commits (i.e. if leave lines 'pick', without modification or reordering).

how can solve these issues? should noted repository automatically imported previous (svn) repository hosted on google code. conversion seemed far have worked well, i'm wondering why these errors when trying rebase commits.

the history of project seems contain number of merge commits (presumably made those). presence of merge commits in want interactively rebase causes problems. (an interactive rebase pretty assumes linear history, merge commits not linear.)

your project history somehow seems have two parallel histories merged in commit 11b3653 (use tool gitk or tig see this, it's not shown on github's web interface).

i suggest attempt first flatten history rid of parallel histories, , remove merge commits. then, once have strictly linear history, can set rewriting history remove debugging churn.


Comments

Post a Comment

Popular posts from this blog

python - No exponential form of the z-axis in matplotlib-3D-plots -

-
Image
i have similar problem described in how prevent numbers being changed exponential form in python matplotlib figure : i don't want (in special case) weird scientific formatting of axis. problem different have problem @ z -axis. 2-d plots can use ax.get_yaxis().get_major_formatter().set_useoffset(false) . , there no function ax.get_zaxis() what use format z -axis same way? edit: example: from mpl_toolkits.mplot3d import axes3d import numpy np import sys import matplotlib import matplotlib.pyplot pyplot def func(xi, ti): res = 10e3 + np.cos(ti) * np.sin(xi) return res if __name__ == '__main__': timespacing = 20 timestart = 0 timeend = 1 time = np.linspace(timestart, timeend, timespacing) widthspacing = 50 widthstart = 0 widthend = 3 width = np.linspace(widthstart, widthend, widthspacing) reslist = [] matplotlib.rcparams['legend.fontsize'] = 10 fig = pyplot.figure() ax = fig.gca(projection = '3d...
Read more

php - Best Light server (Linux + Web server + Database) for Raspberry Pi -

-
i install web server database on raspberry pi (little computer). computer has 1gb ram. i want know best combination: linux distribution , web server , dbms run local server multiple users minimal latency, use php on server. , best settings performance , not have bugs (memory usage, disable plugin, disable service, etc)? i thought light debian , lighttpd server , sqlite database. solution? i think lighttpd + sqlite great choice. linux distro, debian @ centos or tiny core linux , although i'm not sure of compatibility pi. obviously, can't go wrong raspbian if want use in production , more stable performance, few more pi's , set them in cluster .
Read more

c# - "Newtonsoft.Json.JsonSerializationException unable to find constructor to use for types" error when deserializing class -

-
i developing app in xamarin android. have splash screen serialize class , pass mainactivity using intent . when try deserialize in mainactivity error message : "serializationexception unable find constructor use types" serialization : void loaddata() { currency currency = new currency(this); intent = new intent(this, typeof(mainactivity)); intent.putextra("currency", newtonsoft.json.jsonconvert.serializeobject(currency)); startactivity(intent); } deserialization : cur = newtonsoft.json.jsonconvert.deserializeobject<currency> (intent.getstringextra("currency")); // error here class constructor : public currency(context context) { thiscontext = context; } i began experiencing problem after added parameter context context constructor. has caused this? how can solve it? possible serialize/deserialize class has parameters? you need have empty constructor in currency class in order deserialize it. ...
Read more