How to merge branches when you see "merge locally" in Git


How to merge branches when you see "merge locally" in Git

When branches have issues on GUI while merging:

Run following commands:
1. git checkout main_branch

2. git merge feature_branch

3. git rebase -- continue

If git rebase have issues:
git status

git fetch origin

git log main_branch -1

git rebase --abort

git rebase origin/main_branch

git add .

git rebase --continue

Comments

Post a Comment

Popular posts from this blog

How to work with MySQL client package in MacBook

Image
  On installing mysqlclient package you may face the following issue: Collecting mysqlclient==2.2.0 (from -r requirements.txt (line 14))   Using cached mysqlclient-2.2.0.tar.gz (89 kB)   Installing build dependencies ... done   Getting requirements to build wheel ... error   error: subprocess-exited-with-error      × Getting requirements to build wheel did not run successfully.   │ exit code: 1         File "<string>", line 154, in <module>         File "<string>", line 48, in get_config_posix         File "<string>", line 27, in find_package_name       Exception: Can not find valid pkg-config name.       Specify MYSQLCLIENT_CFLAGS and MYSQLCLIENT_LDFLAGS env vars manually       [end of output]      note: This error originates from a subprocess, and is likely not a problem with pip. error: subprocess-...
Read more

Issue with Pushing Code after Merging Changes from Multiple Branches

I have a branch feature-branch and feature-branch-new-for-merging. I have made clone from feature-branch and take the pull from feature-branch-new-for-merging and made changes and when I'm pushing the code. I’m receiving this: hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.   Got it! If you’re trying to push and encountering this issue, it means your local branch is behind the remote, and Git won’t allow you to push without first integrating those remote changes. Here’s how to handle this safely: Option 1: Merge Remote Changes Locally, Then Push This is the safer option, as it integrates the remote updates without losing any local work. Fetch the latest changes from the remote: git fetch origin eight8 Merge the fetched changes into your local bran...
Read more