Category "branch"

Re-merge a branch into Master

I created and pushed a branch called Branch-A. Someone merged Branch-A into Branch-B, deleted the changes I added to Branch-A and merged Branch-B into Master. I

Fast-forward merge is not possible. To merge this request, first rebase locally

Recently, I have created newbranch and created a merge request to Master branch. Before TeamLead accept merge request into Master branch another team member was

New git submodule missing everytime I checkout my repo/branch

Whenever I clone my repo (<my_repo>) locally, the new submodule's directory (under <my_repo>/_includes/<NEW_submodule_2>) is empty. I have add

Different branches in repositories

When I see my branches in a local repository with git branch in the terminal it prints only one, which is master But when I go to the gitlab page I have two bra

How to pass branch name dynamically to bamboo plan?

Is there a way to pass/change the branch name to the bamboo plan before 'source checkout' task? I tried using 'script' task and exporting branch related bamboo

show current GIT branch name in windows command prompt

Is is possible to display current git branch name in regular windows command prompt? Let's say on windows 7 or 10.

git delete branch with name contains special chars

Could you please help me? I have created a git branch with the wrong name and I am not able to delete it because the name contains some crazy characters. I copi

Is it okay to use git without branches?

I have used git a few times and it has always been a painful experience. However i noticed that bitbucket host private repos for free if less then 5 users and I

git - how to get default branch?

My team alternates between usage of dev and master as default branch for several repos and I would like to write a script that checks for the default branch whe