python (65.1k questions)

javascript (44.2k questions)

reactjs (22.7k questions)

java (20.8k questions)

c# (17.4k questions)

html (16.3k questions)

r (13.7k questions)

android (12.9k questions)

Questions - git-pull

what does -X option do with git pull?

git pull origin -X theirs branch_name What does -X theirs do in this git pull command? Does it cause the specified branch to be merged into the current branch?
test-img

Justin Haubrich

git

git-pull

Votes: 0

Answers: 1

Latest Answer

-X specifies the merge strategy option (not to be confused with the merge strategy) when combining your local changes with changes pulled from upstream. You can read up on the different merge strategi...
test-img

codewario

Git pull/Git clone returns blank value when using Invoke-Expression powershell

I am trying to run a Git pull and Git Clone command using Invoke-Expression mentioned below. In case there are any failures when running the below command, I wanted to capture the details on a variabl...
test-img

Dhillli4u

git

powershell

git-clone

git-pull

Votes: 0

Answers: 1

Latest Answer

git is kind of a weird cli as it makes use of stderr quite a bit. You don't need Invoke-Expression at all here: $url = "https://${UserName}:${Password}@${Gitpath}" $gitPullResult = git pul...
test-img

Maximilian Burszley

Resolving git pull merge conflicts

Is it correct that for git pull (and thus git merge by extension) to throw merge conflicts, the local and remote repositories have to be out of sync ? Basically, is it necessary for these 2 conditions...
test-img

coolest-duck

git

git-merge

git-pull

pull

Votes: 0

Answers: 2

Latest Answer

Pretty much correct. As for the merge: Certainly there must be a commit on your side that the remote doesn't have; otherwise we'd fast forward, which is not really a merge. And there must be a commit ...
test-img

matt

Basic question on practice of git pull before git push

On a high level, I understand that it's a good practice to git pull(and manually merge conflicts if any) before git-push. I am working in an enterprise setting. My questions are: (1) Can I do git-push...
test-img

security639

git

github

git-commit

git-push

git-pull

Votes: 0

Answers: 1

Latest Answer

Addressing your questions one by one: (1) Can I do git-push without first git-pull?. Is it not allowed at all or github can be configured (by admin) to behave in a certain way -- say to crib during p...
test-img

sleske

Posts

Questions

Blogs

Jobs