After committing all changes, which are necessary to complete the Issue, into the local feature branch it is time for consolidating your contribution into the public develop branch (origin/develop branch).
For contributing your work, click on the source control symbol (the branch icon in the menu bar to the left).
In a first phase of the process, you have to assure that your contribution is not creating any conflicts while merging into the public develop branch (origin/develop branch).
For this purpose, you have to merge the origin/develop branch into your local feature branch. (Please, be aware that this is the opposite direction from the actually intended.)
-
Open the menu at the repository, which you would like to contribute to, click on "Branch zusammenführen"...
-
... and chose the origin/develop branch from the list.
-
If there would be any conflicts, they would show up now.
-
After analyzing two conflicting versions of the code, you could decide for the versions (current, incoming or both) to become part of your local feature branch.
-
Save the files, which got changed during resolving all conflicts by Ctrl+s and stage them for being committed during the merge of the origin/develop branch into your local feature branch.
-
Confirm the merge of the origin/develop branch into your local feature branch ...
-
... and push your local feature branch with the resolved conflicts to the remote repository (creates or updates remote feature branch).
In the second phase of the process, you have to create the Pull-Request for consolidating the remote copy of your feature branch into the origin/develop branch.
-
Click on the Pull-Request icon at the repository you would like to change.
-
VSCode is now automatically filling the source and target branch names into a form and you just have to double check.
Please, add a Pull-Request message, which is complying the chapter about Formulating Pull-Request Messages and click Create.
-
Alike in the following picture, the Pull-Request does not create any conflicts and can directly be merged after reviewing the changes. As you can see, the Pull-Request is not involving your local repository. The Merge is happening exclusively in the remote repository on GitHub.
-
At least the originator of the Issue, which is underlying the branch that is now requested to be merged, should be marked as a Reviewer.
-
The Pull-Request shall be assigned to the person, who is consolidating potential feedback, merging the Pull-Request into the origin/develop branch and deleting the feature branch.
In the third phase of the process, it is recommended to immediately clean up your local repository.
After successfully merging into the origin/develop branch, the remote feature branch should have been deleted, but the local copy is still existing.
For avoiding accumulation of useless branches in your local repository, it is recommended to delete the local feature branch right after successfully merging into the origin/develop branch.
-
For deleting the obsolete feature branch, you have to leave it first.
So open the list of branches ...
-
... and chose the develop branch from the list.
-
Open the menu at the repository, which you would like to clean up, click on "Branch löschen"...
-
... and chose the obsolete feature branch from the list.
<- Back to Creating a Commit - - - Up to Preparing for Specifying Applications