kblincoe / VisualGit_SE701_2019_1

1 stars 0 forks source link

[BUG] Syncing local repo does not merge with upstream #180

Open Ravid12 opened 5 years ago

Ravid12 commented 5 years ago

Describe the bug When syncing a local repository with one on github, using the sync button, the command to merge upstream/master has a typo. The client currently adds the git merge upstrean/master command. The client also does not actually run these commands, but also just prints them to the 'console'.

To reproduce Steps to reproduce the behavior:

  1. Open a local repository (Does not matter if you signed in as a user or not)
  2. Press the "sync button" [see screenshot]
  3. Provide the correct HTTP path which matches your local repository
  4. See typo in the console, where the last command is git merge upstrean/master

Expected behavior / Acceptance criteria The correct command (git merge upstream/master) should be added and all commands should be executed

Screenshots "Sync" button for step 2 image

Desktop (please complete the following information):

darcycox97 commented 5 years ago

Agreed that this doesn't work. But the issue appears to be larger than what you said in the description. On pressing sync, the addCommand function is called to print these commands to the display, but this function does not actually run the command.

So while there is a typo, this isn't the issue because no git commands are actually called. This issue should be updated to include adding sync functionality. Probably would be a medium.

Ravid12 commented 5 years ago

@darcycox97, after closer examination, you're right. I will update the issue description.

hhagenson28 commented 5 years ago

Agree with above, approved.

rmberriman commented 5 years ago

Agreed - I have the described typo in console as shown below: image

Approved!