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

Pull Request Conflict Tutorial #24

Open
ciaranRoche opened this issue Apr 27, 2018 · 0 comments
Open

Pull Request Conflict Tutorial #24

ciaranRoche opened this issue Apr 27, 2018 · 0 comments
Labels
enhancement New feature or request

Comments

@ciaranRoche
Copy link
Member

Currently, our git-commands tutorial has no solution on how to deal with conflicts.

Some features/commands that should be added to git-commands

  • git rebase --continue
  • git rebase -i { COMMIT }
  • basic vi usage for editing git commits
@ciaranRoche ciaranRoche added the enhancement New feature or request label May 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@ciaranRoche