Fork me on GitHub
#emacs
<
2018-10-10
>
lilactown15:10:58

I'm trying to use magit to rebase. I keep getting in a state where I resolve a conflict while rebasing, save the file, and then instead of it being staged the changes are not staged and magit shows the particular commit as gone

lilactown15:10:13

also the auto-staging when I save is infuriating. I almost threw my computer through a window just now because I decided to try and rebase manually from the command line and magit / spacemacs / something kept sticking it back in that weird state when I saved the file from vim 😡

dpsutton15:10:58

i've never heard of auto-staging. could it be vim is auto staging?

mgrbyte15:10:49

suspect this is something in spacemacs, never had magit "auto-stage" anything

lilactown15:10:50

nope. it's definitely magit in Emacs

lilactown15:10:57

probably true. I am using spacemacs

lilactown15:10:58

OK this is definitely a git issue. I modified the file to fix the conflicts, staged it, and now the changes are gone and I can't continue ¯\(ツ)

lilactown15:10:30

by "changes gone" I mean that they don't show up as staged after adding the file

mgrbyte15:10:39

checked your gitignore file?

lilactown15:10:21

definitely not ignored

mgrbyte15:10:43

¯\(ツ)/¯ then, sorry!

lilactown15:10:48

yeah I think I screwed up the history somehow. I think what happened is I branched off of this feature branch, merged master in, then merged to master, now I'm trying to rebase and it's getting multiple commits for the same changes

lilactown15:10:03

so now I'm trying to rebase like a newb and it's not happenin'