Spring Development Training 2017: week 5

1

Git is a distributed version control system created to manage large source code repositories among a large number of developers.

1

With Git, while it is a distributed system, you still must push to the repository from which you pulled.

1

You are the only developer that will be working on a new feature. The master branch, and develop branch will eventually need this feature. Select the best course of action for how to begin working on this feature.

1

You can avoid many rebasing problems by remembering to never
- rebase after pushing a branch
- rebase after commits use your branch
- rebase after pulling someone else's branch

1

You wish to exclude certain files from git which you do not want to check into the project. The best option for managing this is:

1

If you are still working on a feature in a "feature" branch, but need to work on bug fix on master what should you do?

1

Given the commit history to the left, suppose you are ready to move the feature back into master, what is the best way to do this?

1

Given the commit history to the left, suppose you want to move other peoples changes to master onto your feature branch, what is the best way to do this?

1

Given the scenario to the left. You wish to undo the last 2 commits on your hotfix branch and discard their history. What Git command should you use.

Test your understanding of Git

Spring Development Training 2017: week 5

Git is a distributed version control system created to manage large source code repositories among a large number of developers.

With Git, while it is a distributed system, you still must push to the repository from which you pulled.

You are the only developer that will be working on a new feature. The master branch, and develop branch will eventually need this feature. Select the best course of action for how to begin working on this feature.

You can avoid many rebasing problems by remembering to never - rebase after pushing a branch - rebase after commits use your branch - rebase after pulling someone else's branch

You wish to exclude certain files from git which you do not want to check into the project. The best option for managing this is:

If you are still working on a feature in a "feature" branch, but need to work on bug fix on master what should you do?

Given the commit history to the left, suppose you are ready to move the feature back into master, what is the best way to do this?

Given the commit history to the left, suppose you want to move other peoples changes to master onto your feature branch, what is the best way to do this?

Given the scenario to the left. You wish to undo the last 2 commits on your hotfix branch and discard their history. What Git command should you use.

You can avoid many rebasing problems by remembering to never
- rebase after pushing a branch
- rebase after commits use your branch
- rebase after pulling someone else's branch