Git-merge Questions

I have merged a branch to master on github and wanted to do a git pull locally after that. when i did a git pull it asked me to commit changes, so

I stashed the recent change i have on my local machine, and then pull from the remote repository. along the way, i encounted the below error. how

I created branch a of master branch. i made changes and raised pull request to master branch. when i open new pull request to master

My problem is that when try to do a simple git merge the branch that i am merging into loses entries but there is no merge conflict - just lost

I plan on creating a feature branch, and in addition to the new commits in the feature branch, i might also make file edits to an older commit in

Requirements inside a pipeline after code has been committed and pushed, i am looking to detect merge conflicts is

For my job i need to do a git rebase of my feature branch onto the development branch. these are my commands thus far to prepare the

Sometimes i squash a bunch of commits together. usually my commands follow this pattern: git reset --hard head~4 git merge --squash

I'm working on a project where "squash and merge" is the preferred approach for merging pull requests. is there a way to make this the default

If two people are working on the same repository on github and the same branch master. then say person a pushes their change to master and i as

I've just tried to rebase some changes i'm submitting to a remote repository, and can't get it to complete after i resolve conflicts. i tried to

I have this command git merge -xignore-all-space origin/dev scares me a little bit b/c i am afraid of merging a

Two repositories exist: rep1, rep2. both are results of one-way syncs from the same svn instance. (the changes in svn are synched to git, but the

Git philosophy question: are "ancestry" and "history" (a.k.a. chronology) distinct things?... behold, i have the following git

Bottom line: i want to split up a pull request into two smaller pull requests with different subsets of files. i do not

I have a github fork, which i have cloned onto my computer. on the original project, i have opened many prs, and each of them correspond to their

In gitlab documentation described a nice way to

I have to merge two separate git repositories orig and work. work was created as a derivative of a subdirectory of orig, with some experimental

I used squash and merge for merging dev branch into main because i didn't want some of the commit messages

I sometimes need to make a snapshot of the current (possibly dirty) working directory. git stash save -u is very similar to what i

I tried to commit to a public github repo, basically what i did was: - fork the project's (master branch) - made my changes and

Consider the merge-bases of branches b and a in the following map: a0---------a1--a (topic) / \ / ---m0--\--m1--m

1 to 2 weeks ago, i found a reference on the web, saying that this command: $ git diff origin <branch> head

Let's consider, 3 people are working in a project and they are using git. can the project repository be in any one of their github

I'm doing a rebase and i want to keep always the changes made in the latest commit to avoid having to resolve the conflicts manually.

In github, how can i do a two-way merge in a pr so any lines in the target branch not explicitly deleted in the source branch are not removed?

Within project, someone pushed new files, i didn't pull them, then i've added new files, commited and then tried to push it to main.

I have a scenario where one developer created a branch, made changes to a file and submitted changes to git. at the same time another developer

I am working in a company and we decided that we want to use git more properly. i am responsible for integrating dev branch into main branch, and

My team likes to have a "clean" git history, and likes commits to be squashed before i request a code review. one aspect of this workflow i'm

I am new to git and this is my situation: i have two branches: master - contains

What is the difference between a fast-forwarded git merge and a git rebase? don't both accomplish keeping history linear

Is there a way to find out from the git log the person who opened the pull request on github? i am not looking for the person who merged

Tl;dr: if i fetch remote changes into a local git repo, then do a merge, and some time later i fetch some new changes, but this

It appears that a git merge commit clobbered changes i made on one parent. specifically, one parent contained a change (removing some lines from a

I have two branches in my project, one is develop and other is master, accidently without

Misusing the "-s ours" merge option when merging origin/develop into local develop essentially throws away work done since the last time develop

I'm using git revert on a very basic use case, in order to learn how it really works, but i'm facing the following issue. i've read a couple of

I am working on a project using intellij as ide and git as repository. i have the following problem:

I had a lot of uncommitted changes, which is bad practice. i have tried to slowly commit all my important changes. i was trying to

Assuming i have two repositories called repositorya and repositoryb. i need to merge a commit abcdefgh

Short version: i have two branches with different contents. when i am in one branch and do a merge from the other, it

I have always kept track of files in the child repo. but now i also need to keep track of another child, so i renamed

The git merge command has an option to perform fast-forward merge, but this is not what i want, because if it can't do a fast-forward

I'm merging a hotfix branch into master. when i do a simple git merge hotfix-2.09 the merge fast-forwards but i'm getting a

Coming from mercurial, i use branches to organize features. naturally, i want to see this work-flow in my history as well. i started my

Recently i came across the notification that my branch has diverged. that was when i made a feature branch, pushed it to remote, and did a rebase

Say i have two branches, master and staging, and i would like to have two different versions of /robots.txt

I pull from my branch: git checkout mybranchsample git fetch git pull origin master then, git

Let us suppose the repository looks like this: master | a--b--c--k--l--m e-f-g

I have following use case. i have a mainline branch. created new branch(dev) from mainline. did

Is it true that git rebase is more prone to conflicts than git merge? i have heard that before and it is referenced in

How can i know if a branch (or commit) is merged in sourcetree? when using gitk --all, it will show for a commit (or branch)