Textpattern CMS support forum
You are not logged in. Register | Login | Help
- Topics: Active | Unanswered
[SOLVED] Git broken on dev branch ?
I tried to git pull to get the latest code. Instead of doing its usual routine, it drops me into an editor (Vi? may be, dunno, never used that one, honest), bitching about wanting a commit message or something. Anything I tried to get out of that editor -no i don’t want to write a commit message, I changed nothing…– failed. I ended up closing the terminal window.
Next in a new terminal window,
git pull
error: Your local changes to the following files would be overwritten by merge:
textpattern/lib/txplib_misc.php
textpattern/publish.php
textpattern/vendors/Textpattern/DB/Data/core.prefs
Please commit your changes or stash them before you merge.
AbortingI didn’t change those files… What now? Nuke the whole thing, then pull some completely fresh thing?
Where is that emoji for a solar powered submarine when you need it ?
Sand space – admin theme for Textpattern
Offline
Re: [SOLVED] Git broken on dev branch ?
Might be better to re-clone it after the snafu.
The smd plugin menagerie — for when you need one more gribble of power from Textpattern. Bleeding-edge code available on GitHub.
Txp Builders – finely-crafted code, design and Txp
Offline
Re: [SOLVED] Git broken on dev branch ?
Ok, thanks. I’ll fetch an all fresh one.
Where is that emoji for a solar powered submarine when you need it ?
Sand space – admin theme for Textpattern
Offline
Re: [SOLVED] Git broken on dev branch ?
Yeah, if you had pulled the code already which had the erroneous merge in there, you’ll have to re-clone a fresh one. I had to do the same on my home computer.
If you had not pulled that commit prior to the rebase then all should function as expected.
Offline
Re: [SOLVED] Git broken on dev branch ?
Ok, done.
git status
On branch dev
Your branch is up-to-date with 'origin/dev'.
nothing to commit, working tree cleanWas kinda slow tonight, fetching at ~150kbs
Where is that emoji for a solar powered submarine when you need it ?
Sand space – admin theme for Textpattern
Offline