Skip to content

jsbsmp/test_pull_request

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

11 Commits
 
 
 
 

Repository files navigation

How to test pull request

  1. Clone
  2. Add branch
  3. Change in branch
  4. Commit and push to branch
  5. Create Pull Request in Github

How to resolve Pull Request conflict

  1. Checkout master branch
  2. Pull master
  3. Checkout conflicting branch
  4. Rebase with master git rebase master
  5. Push conflicting branch

Alternative

  1. On conflictign branch:
  2. In IntelliJ - Pull (Branches to merge: origin/master)
  3. Resolve conflicts
  4. Push conflicting branch

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published