cherry pick - Git: move changes between branches without working directory change -

-

use-case: every time want move commit 1 git branch perform following sequence of actions:

  1. [commit working branch]
  2. git checkout branch-to-merge-into
  3. git cherry-pick target-commit
  4. git push
  5. git checkout working-branch

that works fine exception - every time perform 'git checkout' git working directory content changed (expected) , causes ide (intellij idea) perform inner state update (because monitored file system sub-tree modified externally). annoys in case of big number of small commits.

i see 2 ways go:

  1. perform 'mass cherry picks', i.e. perform big number of commits; move them branch, say, @ working day end;
  2. have second local git repository , perform cherry picks on it, i.e. every time actual commit , push performed working branch, go second repository, pull changes , perform cherry pick there;

i don't first approach because possible forget move particular commit. second 1 looks bit... unnatural.

basically, perfect if git 'move commit branch name branchx branch branchx+1' without working directory update.

question: possible perform above?

no, not possible move commit between branches without changing working directory. because run conflict, @ point git pauses can fix conflict. if working directly did not represent state, not able fix conflicts correctly.

if around, find lot of other possible solutions problem on so, underlying issue sounds editor not handle files being changed out underneath it. fact of using git. so, either update editor or move more suited git workflow.


Comments

Post a Comment

Popular posts from this blog

ASP.NET/SQL find the element ID and update database -

-
basically i've got update query runs when click submit button. i have asp:repeater in page layer inside this <asp:repeater id="dgbookings" runat="server" onitemdatabound="itemdb"> <itemtemplate> <div class="bookingscontent"> <div class="bookingdetails" id="<%# databinder.eval(container.dataitem, "booking_ref") %>"> <p class="infotext"><%# databinder.eval(container.dataitem, "adults") %> <asp:linkbutton onclick="editdetails" text="edit..." runat="server"></asp:linkbutton></p> <p class="infotext"><asp:linkbutton onclick="submitdetails" text="submit..." runat="server"></asp:linkbutton></p> </div> </div> </itemtemplate> <asp:repeater> and outputs ...
Read more

c++ - Compiling static TagLib 1.6.3 libraries for Windows -

-
i having super hard time compiling , using taglib 1.6.3 in qt project. i've tried can think of. taglib claims supported through cmake i'm not having luck. furthermore, i'm confused kinds of files need qt libs! i've built *.a files, *.lib, , *.dll. understand far... believe since i'm working in windows *.lib want. no matter do, end "undefined references" taglib functions try use when try compile qt project. have tried mingw32, msys, visual studio 2008, , cross-compiling windows on linux. turning nothing. what makes less sense me if compile same taglib source qt on mac (g++ think?) works fine! somewhere in windows compilation procedures have going wrong. have been smacking face on desk 30 (on , off) hours trying figure out. since qt uses mingw must compile taglib same compiler? if compile *.lib's visual studio not compatible? are *.a libraries usable in windows? (assuming mingw) i'm still trying handle on c++ stuff, after reading coun...
Read more

PostgreSQL 9.x - pg_read_binary_file & inserting files into bytea -

-
i have been looking everywhere (google, stackoverflow, etc.) documentation on how use postgresql pg_read_binary_file() function. the meaningful thing can find this page in official documentation. every time try use function error. for example: select pg_read_binary_file('/some/path/and/file.gif'); error: absolute path not allowed or select pg_read_binary_file('file.gif'); error: not stat file "file.gif": no such file or directory do need have file in specific directory postgres have access it? if directory? if matters, reason looking @ function because trying insert file database without doing crazy things . as stated @a_horse_with_no_name , @guedes solution ensure file being uploaded on server in pgdata directory. the postgres documentation state file location requirement. additionally, made symlink directory pgdata directory not disturb of postgres data structure. seems working , don't have of above...
Read more