Even after restoring to this morning's state via Time Machine, and attempting to retry the process, I get the same result. However, I'm unable to move forward or to restore my repo to a workable state. somehow it involves changes having been made to the feature branch (aka JQMUpdates5 in the screen cap) that I was unable to switch to.?Īt least I got those deleted files back. I was able to simply undo-button my way back and restore those deleted files, but this did inexplicable things to the Gitkraken timeline (see ) that I have no way of understanding. Some of them I didn't even touch since my last commit, others were new files I had made. immediately, still in hotfix and having done nothing further, suddenly there are 27 file changes staged and ready to commit! All of them deleted files, and none of which did I actually throw away.
making me the first person to have this happen, I guess. Could not remove Operation not permitted." What? Web searches with these key phrases turned up literally nothing. Gitkraken throws the error: "Checkout failed. Then I tried to switch to the feature branch (which I hadn't been in for weeks as it has been all about hot fixes lately), and all hell broke loose. This morning, I did some work on hotfix, and merged it into master. Apparently I'm indeed not ready to power-use Git or Gitkraken. Since now I'm having this bizarre issue, I can see why I hadn't taken that leap yet. I consider this an intermediate practice as I continue to maintain the site while getting my head around Git.
So far I've endeavored not to get more complicated than this.Įven my one feature branch is a bit cowardly, in that that I still keep my feature work separate (in separate files/directories) from my working files, and consistently merge master into the feature branch so I don't lose all the site's hotfixes – all so that my crucial site files are kept whole and untouched regardless of branch. I make changes in hotfix, commit, push, and merge into master (which I then also push). As such, I just have a hotfix, a master and a feature branch. As will soon become clear, I'm not a master of Git or even Gitkraken.
0 kommentar(er)
