Skip to content
This repository has been archived by the owner on Feb 25, 2020. It is now read-only.

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

Open
Ravid12 opened this issue Mar 30, 2019 · 4 comments
Open

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

Ravid12 opened this issue Mar 30, 2019 · 4 comments
Labels
Approved bug Something isn't working Small

Comments

@Ravid12
Copy link
Collaborator

Ravid12 commented Mar 30, 2019

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):

  • OS: [Windows 10]
@Ravid12 Ravid12 added bug Something isn't working very small labels Mar 30, 2019
@darcycox97
Copy link
Collaborator

darcycox97 commented Mar 31, 2019

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
Copy link
Collaborator Author

Ravid12 commented Apr 1, 2019

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

@Ravid12 Ravid12 added Small and removed very small labels Apr 1, 2019
@hhagenson28
Copy link
Collaborator

Agree with above, approved.

@rmberriman
Copy link
Collaborator

rmberriman commented Apr 7, 2019

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

Approved!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Approved bug Something isn't working Small
Projects
None yet
Development

No branches or pull requests

4 participants