Closed eddiekelleypdx closed 5 years ago
ok, I have to ask, how are you doing the merges that it ends up repeating a bunch of commits?
Not entirely sure - I think that this is happening after doing git rebase master
a couple of times (yesterday after master was updated after the original branch
, and again this morning after some recent changes made it into master). From what I can tell, the repeated commits have the correct hashes (when comparing them with the same commits in master), and shouldn't show duplicated history when merged in(?), but that may remain to be seen... Too bad I didn't take the branching strategy class before this one ;-)
Edit: Actually, maybe it was a single rebase? I don't recall at this point :-(
Oh, wait, now I see what you're talking about... 52516a3 and 957dc0d are the same commit, and are repeated (as well as a340eee and e6fd665). I'm not sure how that made it in, nor am I sure of the best way to clean that up.
I mean, rebase got you into this mess? 😛 but I just had to ask, I agree it should merge fine, despite the duplication. you can take a go at another rebase and just pull it if it doesn't work out. you're not using any flags are you?
It seems like just doing git rebase master
, and then walking through correcting the commits did this... I've attempted to re-rebase after doing a git reset
to a previous commit (and have also squashed the commits down into 1 this time), and it seems to be cleaner, but I'm going to have to force push this branch to update it...
Just did the force push... The commit history seems much cleaner (there was definitely some odd stuff being included with the previous ones), and the functionality seems to be there, but please give it another eye. Sorry for the additional work.
Nice, everything looks good, and a clean history
Added @log_history to commands that weren't being logged; Now does a "pretty"
ls
usinglistdir_attr()
when-l
flag is passed Moved #endregion outside of command section; Added unit tests to supportls
command's "long" list argumentls
command should provide "long" directory listings when passed-l
as the first argument;