! 000c14842.48b8c76e3 feature/DH_clean_torrents_nzb -> origin/feature/DH_clean_torrents_nzb (unable to update local ref) ! b326cf5a5.74052e3e7 feature/textbox-url-attr -> origin/feature/textbox-url-attr (unable to update local ref) 10:15:47 WARNING CHECKVERSION :: "/usr/local/bin/git" fetch -prune origin returned : error: cannot lock ref 'refs/remotes/origin/feature/textbox-url-attr': is at 74052e3e708cfe777ba94b8fa884cf32e1b47ab8 but expected b326cf5a52738cad1dbc9e3cfee753ca9c198333 ! 74052e3e7.6ec36ccc2 feature/textbox-url-attr -> origin/feature/textbox-url-attr (unable to update local ref) 11:15:51 WARNING CHECKVERSION :: "/usr/local/bin/git" fetch -prune origin returned : error: cannot lock ref 'refs/remotes/origin/feature/textbox-url-attr': is at 6ec36ccc26ae4688cdd7bbfc63eb9441a86e8e13 but expected 74052e3e708cfe777ba94b8fa884cf32e1b47ab8 11:15:51 WARNING CHECKVERSION :: Unable to contact github, can't check for update 13:47:20 WARNING CHECKVERSION :: "/opt/bin/git" config returned : error: could not lock config file. 13:47:22 WARNING CHECKVERSION :: "/opt/bin/git" branch master -set-upstream-to origin/master returned : error: could not lock config file. Hint: "git branch -set-upstream-to=origin/master". Hint: the remote tracking information by invoking Hint: After fixing the error cause you may try to fix up git/config: File existsĮrror: Unable to write upstream branch configuration 13:47:12 WARNING CHECKVERSION :: "/opt/bin/git" branch master -set-upstream-to origin/master returned : error: could not lock config file. Result on the remote: A - B - C - D - M (identical to D) <- main, mybranchĪs you can see, main and mybranch now point to the same commit, M, which is identical (in content) to D, which was the state of main but the history has been preserved.Hi, when running a version check in my Medusa instance on my Qnap I suddenly get the following: Then you would reverse merge mybranch into main with the ours strategy, and then merge main into mybranch: git fetch You might mean: I want to keep X and Y and Z but I want the state of my project in mybranch to be identical to the state of my project in main. Result on the remote: A - B - C - D <- main, mybranchĪs you can see, main and mybranch are the same commit, and the separate history of mybranch is effectively gone.
If you now want to start over, with mybranch emanating from main, then start over: make mybranch: git switch -c mybranch Now mybranch is gone - both locally and on the remote. Just delete mybranch altogether! It serves no purpose: git fetch Then there is no need for all this violence (hard reset, force push, etc.). I want mybranch to start all over, emanating from where main is now." I'm sorry about all the work I've done on mybranch. When you say you want mybranch to be the same as main, you might mean one of two things (at least). Let's say you have this: A - B - C - D <- main So the phrase "make my current branch exactly the same as my main branch" is ambiguous. A branch in Git is merely a name for a commit.
0 kommentar(er)
