Linked Questions

I was on master branch and unfortunately, I run the command git pull origin DEV13-ConsumerReport-20190827 which is created from master, it merged into master automatically. The branch DEV13-...

I merged a feature branch into master. After that a colleague of mine merged some of his work. After that he had to do a revert, which reverted all of my work. I guess that he did a git merge master ...

Consider the following situation. I have two branches: main and main_feature_#1. I created a pull request and merged main_feature_#1 into main. I found some issue with the merge and there was no way ...

A colligue of mine merged a feature branch into our main development branch. I did a revert on that commit. Now I want to merge the development branch into the feature branch, but git deletes all the ...

Merged one branch into my branch, but I reverted that merge. I merged again by git checkout branch1 git merge branch2 but it says already up to date, however, I don't see any changes in my branch. It ...

I have 2 branches : A and B. Both started from the same parent branch : C, and then had some changes made in parallel to each of them. I wanted to merge B to A, and tried merging directly from Gitlab. ...

10 days ago I accidentally merge a feature branch (feature/calendar) into develop branch. After that I revert it. In between, the were some commits made on both branches. Now, I want to merge ...

I've been using Mercurial but would like to do a quick demo of Git. What are the Git equivalents of: hg init . # start a project in the current directory hg addremove # look for any added or deleted ...

Some time ago I created a branch from my master branch. Let's call it new_feature. While I was working on new_feature, the master branch followed its normal evolution. Now that new_feature is ready to ...

Working with git flow. We have a co-worker who is not familiar with Git that accidentally merged develop into master yesterday. Develop has quite a few features that are launching with our next ...

I created an experimental branch from master, and made four commits on the experimental branch. The master, in the mean time, still remains where it last was. Now, I want to merge my experimental ...

First question so I'm going to try to get this correct. I created a branch and was working on a project for a couple of weeks. I created a pull request to merge my branch with the master branch. ...

From time to time we can run across issues where we commit a feature branch to our baseline and discover in some situations it can go horribly wrong, so the change needs to be reverted, without losing ...

In our past life we had a branching system that was .. incorrect. We had to revert a merge because we decided to not release the feature. Now we are ready to release the feature and i'm having a hard ...

Situation: We have a couple of github pull requests that have been merged that have code that needs to be rolled back. Interspersed with these merges are others that need to be preserved. I know we ...