github - Git/hub submodule: track upstream & modify without missing commits -

-

so there 2 specific setups. first:

repoa     submoduleb  <-- repob-upstream

with setup, submodule update --remote tracks latest changes repob-upstream. submoduleb can commit local changes, , repoa can commit changes submoduleb. unfortunately, commits in repoa store hashes of changes submoduleb. since don't have commit rights repob-upstream, on cloning repoa others receive:

fatal: reference not tree: <hash> unable checkout '<hash>' in submodule path '<submoduleb>'

it nice if local commits submoduleb stored in repoa...

second:

repoa     submoduleb  <-- repob-fork  <-- repob-upstream

in setup, have commit rights repob-fork , can push changes submoduleb. therefore submodule update --remote won't throw "unable checkout" errors. unfortunately, have manually merge changes repob-upstream repob-fork.

so,

is there way best of both worlds?


Comments

Post a Comment

Popular posts from this blog

ios - Memory not freeing up after popping viewcontroller using ARC -

-
hi project arc based, using uinavigationcontroller make transition between viewcontroller. using profiler analyse happening behind scene memory. noticed when push viewcontroller allocate memory components , when pop not freeing allocated memory. since using arc unable implement dealloc or release component. have analysed in detail , there no memory leak in project. i not using strong property push viewcontroller. here how pushing viewcontroller. viewcontroller *obj = [[viewcontroller alloc] init]; [self.navigationcontroller pushviewcontroller:obj animated:no]; any clue whats going on? should free memory have consumed. please advise your description indicates have retain cycle, leads objects not being deallocated. typical source of retain cycles properties assigned loading nib files (usually declared iboutlet ). two strategies break them , release objects: declare property weak : @property (nonatomic, weak) iboutlet uilabel *statuslabel; set property nil in...
Read more

Java JSoup error fetching URL -

-
i'm creating application enable me fetch values specific website console. value <span> element , i'm using jsoup . my challenge has error: error fetching url here java code: public class testsl { public static void main(string[] args) throws ioexception { document doc = jsoup.connect("https://stackoverflow.com/questions/11970938/java-html-parser-to-extract-specific-data").get(); elements spans = doc.select("span[class=hidden-text]"); (element span: spans) { system.out.println(span.text()); } } } and here error on console: exception in thread "main" org.jsoup.httpstatusexception: http error fetching url. status=403, url= java html parser extract specific data? @ org.jsoup.helper.httpconnection$response.execute(httpconnection.java:590) @ org.jsoup.helper.httpconnection$response.execute(httpconnection.java:540) @ org.jsoup.helper.httpconnection.execute...
Read more

webstorm - PhpStorm file cache conflict with TypeScript compiler -

-
i've started using typescript in phpstorm keep getting "file cache conflict" window every time make changes .ts (typescript) file. there 3 buttons , have keep pressing "load memory" button. nearly after every single edit. this happens lot after making changes , leaving phpstorm window (i.e. when phpstorm loses focuses). i did research , found solutions disable emmet everywhere - don't have plugin installed remove fsnotifier.exe , fsnotifier64.exe - did it, no luck sync files on frame or editor tab activation , save files on frame - checked , unchecked - no luck please can tell me how stop this? wish there way tell phpstorm make "load memory" default. p.s. files on local drive. there no network involved.
Read more