Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Git pull #757

Closed
bummoblizard opened this issue Feb 2, 2023 · 5 comments
Closed

Git pull #757

bummoblizard opened this issue Feb 2, 2023 · 5 comments
Assignees
@bummoblizard @benwu030
Labels
enhancement New feature or request priority

Comments

@bummoblizard
Copy link
Member

Users are often confused by fetch and pull. The expect the local directory to change when they press fetch. We should support this behaviour by introducing pull feature.

Git pull = fetch + merge

We can ignore the case with conflicts for now. So it will just be fetch + checkout to remote branch.
@bummoblizard bummoblizard added the enhancement New feature or request label Feb 2, 2023
benwu030 added a commit to benwu030/codeapp that referenced this issue Mar 8, 2023
@benwu030
thebaselab#757 primitive fetch feature
c23c4a9
@aehlke
Copy link

aehlke commented Jul 26, 2023 •
edited
Loading

Are you having success with the pull prototype?

@aehlke
Copy link

aehlke commented Jul 28, 2023

this may help: https://stackoverflow.com/questions/39651287/doing-a-git-pull-with-libgit2 it talks about checkout having the wrong default strategy

@bummoblizard
Copy link
Member Author

This new command (lg2) should enable pulling using a terminal command: #887

@bummoblizard bummoblizard moved this from Todo to In Progress in Improve Git user experience Aug 4, 2023
@bummoblizard
Copy link
Member Author

Method for reference: https://github.com/libgit2/objective-git/blob/c5ff513bee3c0d02c48e11c38f049577db0f3554/ObjectiveGit/GTRepository%2BMerging.m#L76

@bummoblizard bummoblizard pinned this issue Aug 4, 2023
bummoblizard added a commit to bummoblizard/codeapp that referenced this issue Aug 8, 2023
@bummoblizard
pull with fast-forward merge thebaselab#757
76bdd5a
@bummoblizard bummoblizard mentioned this issue Aug 8, 2023
Merged
bummoblizard added a commit that referenced this issue Aug 9, 2023
@bummoblizard
Merge pull request #890 from bummoblizard/swiftgit-pull
494fce9 
git: pull with fast-forward merge #757
@bummoblizard
Copy link
Member Author

Pulling with / without conflicts is now supported.

@github-project-automation github-project-automation bot moved this from In Progress to Done in Improve Git user experience Aug 12, 2023
@bummoblizard bummoblizard unpinned this issue Aug 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@bummoblizard bummoblizard

@benwu030 benwu030

Labels
enhancement New feature or request priority
Projects
Improve Git user experience
Status: Done
Milestone
No milestone
Development

No branches or pull requests
3 participants
@aehlke @bummoblizard @benwu030