search

kblincoe / VisualGit_SE701_2

1 stars 0 forks source link

Implement staging functionality, fix committing functionality, and improve diff panel #182

Closed luke-tudor closed 6 years ago

luke-tudor commented 6 years ago

Closes #33, Closes #161, and Closes #139. Added another section for staged files, redesigned how file elements are shown, added functionality for stage and unstage buttons, fix committing, and fix diff panel closing when a different file is selected. @softeng-701

softeng-701 commented 6 years ago

@luke-tudor please squash your commits before the deadline, also make sure all group members have reviewed this

alexblinder commented 6 years ago

@softeng-701 All done! :D

softeng-701 commented 6 years ago

@luke-tudor Looks good! will merge after the deadline

softeng-701 commented 6 years ago

@luke-tudor Please resolve conflicts, thanks

luke-tudor commented 6 years ago

@softeng-701 Conflicts resolved

softeng-701 commented 6 years ago

@luke-tudor Sorry, new conflicts to resolve. Thanks!

alexblinder commented 6 years ago

@softeng-701 @kblincoe We've merged our changes but it seems master is broken. image With master as-is it's impossible to load a repo to work with. I've made a small fix to get at least something to work and tested our contribution. Merge is done (with the bug fix included) but the app is still a pretty broken. image image Do you guys want us to try and fix this up? I think one of the more recent merges deleted swaths of the styles among other things.

alexblinder commented 6 years ago

@softeng-701 Rdy to merge btw :)

kblincoe commented 6 years ago

@luke-tudor thanks. @softeng-701 any idea which PR broke master?

softeng-701 commented 6 years ago

@kblincoe No, I'm not sure which PR caused this issue, I'll investigate