Category: Version control

0. Preparation Checkout the branch you want to rename. 1. Rename local $ git branch -m new-branch-name 2. Change remote

Scenario c1b06e — 62d8d3 [feature] / e73a83 — 6cfaec — 90ed1b [develop] Goal: Merge feature into develop. 2-way merge Solve

Facts It can be locally configured. It can be triggered manually as well. It cleans up not only orphaned commits.

If you don’t want to authorize yourself all the time on the server, just add an ssh key. 1. Generate

Let’s asume you have a repo containing an external SW. (forked repo or specific version) Branches | Commits ————–|————— master

There are common scenarios where you possibly have to resolve conflicts. They are cherry-pick, merge, rebase and revert. If those

Git command All branches $ git log –all –decorate –oneline –graph Specific branch $ git log {branch-name} –decorate –oneline –graph

Is it a git feature? First of all it isn’t a feature from git itself it’s provided by tools like

Let’s asume you have worked on the develop branch and done some commits there. Now you want to create a