A branch is a pointer to a commit object.
*
.
Context:
git commit -a -m "9.1.2024, prepare to go to remotes/origin/desy3.4.3.X" update the current branch (desy3.0.4.X) git fetch --all fetch all branche git checkout -b desy3.4.3.X remotes/origin/desy3.4.3.X git diff > diff.lis (git apply src/sardana/macroserver/recorders/diff.lis, did not work)
git merge someBranch
merging, git checkout main followed by git merge someBranch
merges someBranch into main. If there are conflicts, edit the relevant files,
then make an 'add'
git checkout -b main git push origin main git push --set-upstream origin main yes this is needed otherwise this error appears: $ git push fatal: The current branch main has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream origin main
When creating a project at gitlab.des.de the branch main is created by default. Use the procedure describes above to create the main branch. Then make main the default branch:
Select Settings > Repository. Expand Branch defaults. For Default branch, select a new default branch. Select Save changes.
Select Settings > Repository. Expand Protected branched. Chose Allowed to merge: Developers + Maintainers Allowed to push and merge: Developers + Maintainers Select Save changes.
git branch -d someBranch git push origin -d testbranch
The second command deletes the branch also on the remote repo.
git fetch --all --tags