part2.md

Git Tutorial Part 2 - Workflow

Primer

• Create a pull request
• Resolve merge conflicts
• Squash merge pull requests

Workflow

• Comparing Git Workflows
• Gitflow Workflow

Deep Dive

• Anatomy of a pull request:
  • https://docs.microsoft.com/en-us/azure/devops/repos/git/pull-requests?view=azure-devops
  • Squash merge pull requests

Visual Studio

• Get Started with Azure Repos and Visual Studio

TODO

Are there any problems on an three way merge when using soft reset instead of rebasing?

Problem B0 commit ganz am Ende von https://git-scm.com/docs/git-merge-base beim rebase (der ist genau das, was wir wollen)...

https://stackoverflow.com/a/42143069

https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-merges !!!

Endless merge conflicts without squash when rebasing...

Use old notes as well...

Tortoise git: how would my pr look like?

Commit message template: "User Story #123: Message..." https://devblogs.microsoft.com/devops/linking-work-items-to-git-branches-commits-and-pull-requests/