like below fixes the issue I tried to do a merge from my user-branch to our shared "develop" branch. I'm the only working on this project. GitLab gave me the following instructions which I'm struggling with.
should help you out (I'm assuming before you start that git status is clean, so as not to risk losing any local changes.) Since you're created a temporary branch anyway, why don't you just use git merge othercommit to merge in the other commit? Your working tree and index will be updated with the results of the merge, of course - it'll create a new commit, but if you don't like that you can just checkout your original branch to get back. If you want to make additional changes to fix up the results of the merge, that should really be in additional commit on top of the merge anyway.
git merge --no-commit othercommit
git merge --squash othercommit
Git merge: why I saw some are "Merge branch 'master' of github.com:foo/bar", and some are "Merge remote-t
this one helps. If you do a git pull, the default merge message will include a reference to the upstream repo and the branch being fetched then merged (like github.com:foo/bar). If you do a git merge, the default merge message will reference the upstream branch name (like origin/master)
How to use GitLab function "Create Merge Request" from the bash shell?
To fix the issue you can do A pre-receive hook will run a script before acting on a git push This error is saying that something in that script has gone wrong. You'll need to speak to the admin/owner of your git repo to ask them to help you with this as they will be able to see what went wrong.
Differences github merge "pull-request" and gitlab merge "merge-request"
This might help you There is no difference between PRs and MRs. The terminology "Pull request" is a reference to how git is used for example in kernel development. Say you are a developer, and I am the maintainer. For you to get changes incorporate, you would generate a diff patch and email it to me, so that I can review it, and request that I pull those changes from your repository if I think they are suitable. Hence "pull request", and the git command git pull-request. A merge request is a reframing of this process. This is a result of the fact that we're not really asking for someone to pull from our repository, but rather asking that our changes be merged to the develop/master branch, often from a branch of the same repository. Hence, gitlab phrases the same process "merge request" rather than "pull request".