Closed joshxee closed 6 years ago
Small changes to the file.component styling.
Fixes #44 incidentally by no longer including password in commit signature. A similar functionality was used in stashing and fixed for both stashing and commiting.
@joshxee Looks good!
@joshxee Please resolve conflicts, thanks
@softeng-701 conflicts resolved
@joshxee Sorry, new conflicts to resolve. Thanks!
@softeng-701 The new commits have caused issues with the master build which affects the functionality including deletions to the scss file which are needed and changes to index.html which remove needed script tags.
See commit 6d7ca625b415387df8e28220b6495e3414fc0c7c for details.
I can resolve the conflicts but the underlying functionality of stashing and issue tracking will be broken due to the prior commits. I would prefer that these issues were solved before I merge in my changes.
@joshxee Yes this is understandable, leave it as is
@joshxee Can you post some screen shots of your implementation here, thanks!
Initially I clone an existing repo and add a new file. I then write a stash message: I then click the stash button which saves the stash and refreshes the repo. I can now see what I just stashed in my list of stashes and can apply the stash with the apply button. After a stash is applied all changes that came from the stash are now visible. And to remove the stash I simply click the drop button.
As seen in the screenshots above, all git commands are also logged when they occur.
Can create, apply and drop stashes. New stash menu underneath commit panel.
Dependancy: has to be merged after #176 because I merged that branch into this one. Fixes: #36