Welcome!
This is the community forum for my apps Pythonista and Editorial.
For individual support questions, you can also send an email. If you have a very short question or just want to say hello — I'm @olemoritz on Twitter.
gitui, stash and shellista issues
-
This happens when you are trying to push something which is not a direct descendent of the github repo, like you've made changes in both places. The clone solution works, but the latest git command also has a merge command to help with this.
The way you'd use this would be:
git fetch git merge origin/devel-json
If the merge goes well, you can simply
git push
otherwise, you'll have to go resolve conflict markers. Then git commit will set the version on github to be a parent, and it should accept the push.As for the redownload problem, I have that fixed in
https://github.com/jsbain/stash/blob/git_overhaul/bin/git.pyOr, restart pythonista, and run stash git before running gitui.
-
May humbly suggest that Stash ask the user if, when they type
rm -rf *
, that they are not out of their cotton-picking mind and really want to erase everything. And I do mean everything. At least there is github. First I have to get at stash or shellista back. Just 3 weeks codeing down the bit bucket, but I know what I did.Any simple suggestion as to how I bootstrap them in from ground zero? Going to use has just bought iMazing, but only used it on my iPhone. Oh well.
-
all back except the last 3 weeks oh well
-
Well, the -f generally means "I'm not out of my mind, don't bother me" :).
Use rm -r if you are someone with lots of remorse.I did this in shellista before we added -f, and noticed it taking a long time, and was able to kill pythonista before I lost everything (just mostly everything)....
Btw, the latest stash dev now has the fixed git versions, which should let you use merge.
-
Got it. Back in the day, when I ran a lot of big Fortran programs on a Harris 100 computer, if you wanted to reformat the hard drives, it would ask you a series of "are your sure questions" whose answers went from
Y/N to
Yes/No to
'Type: "I WANT TO ERASE THIS ENTIRE DRIVE".
I now am using iMazing. It is.
-
@polymerchm The
-f
option means "force removal without asking". The-r
means recursively remove folders and all of their sub-folders and files. Please issuerm
asrm -i ...
, if you'd like to have a second look on what is going to be deleted. For most commands, you can type and runcommand_name -h
(e.g.rm -h
) to check available options and their detailed meanings.@JonB In fact,
rm
by default behave likesrm -f
, sorm -r
will still remove everything w/o asking. You have to explicitly require delete confirmation with the-i
option, i.e.rm -i
. You can create an alias likealias rm='rm -i'
so that deletion confirmation is always issued. This behaviour is in line with the Linux version ofrm
. I usually try to stick to Linux behaviour as much as possible. But in this case, it may be worthwhile to break the rule as it is more likely to have a mis-type in Pythonista and data loss is much difficult to recover?? -
@ywangd Been unix-ing for eons. Never do an rm while conversing with your daughter over the phone. Mea culpe.
-
New stash wierdness. Trying to edit
.gitignore
using edit command. when I type:edit .gitignore
the screen jumps to what I was previously editing with no request to "accept the edits", just an empty command line. Enclosure in single or double quotes does not help. This used to work.
asking to edit README.md (which exists) displays that file for editing, but no request to save/not save edits.
-
Try
edit -t .gitignore
The pythonista editor doesn't like extensions it doesn't know about. Though I will say this has been crashing on me.
Also note gitignore is not currently used in git stash... Maybe that should be the next feature to add...
-
Thanks. That did the trick. .gitignore does work in gitview.